diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 9381329593e8bc..bada758b2f187a 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -4511,6 +4511,7 @@ class Acl(Cluster):
     id: typing.ClassVar[int] = 0x001F
 
     class Attributes:
+        @dataclass
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -4524,6 +4525,9 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -4537,6 +4541,8 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=uint)
 
+            value: 'uint' = None
+
 
 @dataclass
 class PollControl(Cluster):
@@ -5890,6 +5896,7 @@ class LocalizationConfiguration(Cluster):
     id: typing.ClassVar[int] = 0x002B
 
     class Attributes:
+        @dataclass
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -5903,6 +5910,9 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -5916,12 +5926,15 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=uint)
 
+            value: 'uint' = None
+
 
 @dataclass
 class LocalizationTimeFormat(Cluster):
     id: typing.ClassVar[int] = 0x002C
 
     class Attributes:
+        @dataclass
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -5935,6 +5948,9 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -5948,12 +5964,15 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=uint)
 
+            value: 'uint' = None
+
 
 @dataclass
 class LocalizationUnit(Cluster):
     id: typing.ClassVar[int] = 0x002D
 
     class Attributes:
+        @dataclass
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -5967,6 +5986,9 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -5980,12 +6002,15 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=uint)
 
+            value: 'uint' = None
+
 
 @dataclass
 class PowerSourceConfiguration(Cluster):
     id: typing.ClassVar[int] = 0x002E
 
     class Attributes:
+        @dataclass
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -5999,6 +6024,9 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -6012,6 +6040,8 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=uint)
 
+            value: 'uint' = None
+
 
 @dataclass
 class PowerSource(Cluster):
@@ -9609,6 +9639,7 @@ class TimeSynchronization(Cluster):
     id: typing.ClassVar[int] = 0x0038
 
     class Attributes:
+        @dataclass
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -9622,6 +9653,9 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -9635,12 +9669,15 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=uint)
 
+            value: 'uint' = None
+
 
 @dataclass
 class BridgedDeviceBasicInformation(Cluster):
     id: typing.ClassVar[int] = 0x0039
 
     class Attributes:
+        @dataclass
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -9654,6 +9691,9 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
@@ -9667,6 +9707,8 @@ def attribute_id(cls) -> int:
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
                 return ClusterObjectFieldDescriptor(Type=uint)
 
+            value: 'uint' = None
+
 
 @dataclass
 class BridgedDeviceBasic(Cluster):