diff --git a/src/mc/external/webrtc/webrtc.h b/src/mc/external/webrtc/webrtc.h
index 2be87d807d..e93002f6da 100644
--- a/src/mc/external/webrtc/webrtc.h
+++ b/src/mc/external/webrtc/webrtc.h
@@ -78,19 +78,19 @@ namespace webrtc { struct SsrcInfo; }
 namespace webrtc {
 // inner types
 enum : int {
-    KRtpCsrcSize = 15,
+    KMaxSpatialLayers = 5,
 };
 
 enum : int {
-    KMaxPreferredPixelFormats = 5,
+    KMaxSimulcastStreams = 3,
 };
 
 enum : int {
-    KMaxSimulcastStreams = 3,
+    KRtpCsrcSize = 15,
 };
 
 enum : int {
-    KMaxSpatialLayers = 5,
+    KMaxPreferredPixelFormats = 5,
 };
 
 enum : int {
diff --git a/src/mc/world/redstone/circuit/ChunkCircuitComponentList.h b/src/mc/world/redstone/circuit/ChunkCircuitComponentList.h
index 4aceffe774..545c9b46de 100644
--- a/src/mc/world/redstone/circuit/ChunkCircuitComponentList.h
+++ b/src/mc/world/redstone/circuit/ChunkCircuitComponentList.h
@@ -2,6 +2,15 @@
 
 #include "mc/_HeaderOutputPredefine.h"
 
+// auto generated inclusion list
+#include "mc/world/redstone/circuit/components/RedstoneLogicExecutionFlags.h"
+
+// auto generated forward declare list
+// clang-format off
+class BaseCircuitComponent;
+class BlockPos;
+// clang-format on
+
 struct ChunkCircuitComponentList {
 public:
     // ChunkCircuitComponentList inner types declare
@@ -14,31 +23,19 @@ struct ChunkCircuitComponentList {
     public:
         // member variables
         // NOLINTBEGIN
-        ::ll::UntypedStorage<8, 8>  mUnk70d17e;
-        ::ll::UntypedStorage<4, 12> mUnkea06a3;
-        ::ll::UntypedStorage<1, 1>  mUnk549a24;
+        ::ll::TypedStorage<8, 8, ::BaseCircuitComponent*>       mComponent;
+        ::ll::TypedStorage<4, 12, ::BlockPos>                   mPos;
+        ::ll::TypedStorage<1, 1, ::RedstoneLogicExecutionFlags> cachedExecutionFlags;
         // NOLINTEND
-
-    public:
-        // prevent constructor by default
-        Item& operator=(Item const&);
-        Item(Item const&);
-        Item();
     };
 
 public:
     // member variables
     // NOLINTBEGIN
-    ::ll::UntypedStorage<1, 1>  mUnkaf6a6f;
-    ::ll::UntypedStorage<8, 24> mUnk27b3c9;
+    ::ll::TypedStorage<1, 1, bool>                                              bShouldEvaluate;
+    ::ll::TypedStorage<8, 24, ::std::vector<::ChunkCircuitComponentList::Item>> mComponents;
     // NOLINTEND
 
-public:
-    // prevent constructor by default
-    ChunkCircuitComponentList& operator=(ChunkCircuitComponentList const&);
-    ChunkCircuitComponentList(ChunkCircuitComponentList const&);
-    ChunkCircuitComponentList();
-
 public:
     // member functions
     // NOLINTBEGIN
diff --git a/src/mc/world/redstone/circuit/CircuitSystem.h b/src/mc/world/redstone/circuit/CircuitSystem.h
index c4331539df..660c437630 100644
--- a/src/mc/world/redstone/circuit/CircuitSystem.h
+++ b/src/mc/world/redstone/circuit/CircuitSystem.h
@@ -23,14 +23,8 @@ class CircuitSystem {
     public:
         // member variables
         // NOLINTBEGIN
-        ::ll::UntypedStorage<4, 12> mUnk167359;
+        ::ll::TypedStorage<4, 12, ::BlockPos> mChunkPos;
         // NOLINTEND
-
-    public:
-        // prevent constructor by default
-        LevelChunkTracking& operator=(LevelChunkTracking const&);
-        LevelChunkTracking(LevelChunkTracking const&);
-        LevelChunkTracking();
     };
 
 public:
diff --git a/src/mc/world/redstone/circuit/CircuitTrackingInfo.h b/src/mc/world/redstone/circuit/CircuitTrackingInfo.h
index 9967afc868..4660d95920 100644
--- a/src/mc/world/redstone/circuit/CircuitTrackingInfo.h
+++ b/src/mc/world/redstone/circuit/CircuitTrackingInfo.h
@@ -2,6 +2,9 @@
 
 #include "mc/_HeaderOutputPredefine.h"
 
+// auto generated inclusion list
+#include "mc/world/redstone/circuit/components/CircuitComponentType.h"
+
 // auto generated forward declare list
 // clang-format off
 class BaseCircuitComponent;
@@ -20,17 +23,11 @@ class CircuitTrackingInfo {
     public:
         // member variables
         // NOLINTBEGIN
-        ::ll::UntypedStorage<8, 8>  mUnk106ebf;
-        ::ll::UntypedStorage<4, 12> mUnk79e265;
-        ::ll::UntypedStorage<1, 1>  mUnkd64ed2;
-        ::ll::UntypedStorage<8, 8>  mUnk8146c8;
+        ::ll::TypedStorage<8, 8, ::BaseCircuitComponent*> mComponent;
+        ::ll::TypedStorage<4, 12, ::BlockPos>             mPos;
+        ::ll::TypedStorage<1, 1, uchar>                   mDirection;
+        ::ll::TypedStorage<8, 8, ::CircuitComponentType>  mTypeID;
         // NOLINTEND
-
-    public:
-        // prevent constructor by default
-        Entry& operator=(Entry const&);
-        Entry(Entry const&);
-        Entry();
     };
 
 public:
diff --git a/src/mc/world/redstone/circuit/components/DirectionalProducerComponent.h b/src/mc/world/redstone/circuit/components/DirectionalProducerComponent.h
index 0d3a53331c..89aab279a8 100644
--- a/src/mc/world/redstone/circuit/components/DirectionalProducerComponent.h
+++ b/src/mc/world/redstone/circuit/components/DirectionalProducerComponent.h
@@ -12,17 +12,16 @@ class CircuitTrackingInfo;
 // clang-format on
 
 class DirectionalProducerComponent : public ::ProducerComponent {
+public:
+    // DirectionalProducerComponent inner types define
+    using AllowedConnections = ::std::bitset<6>;
+
 public:
     // member variables
     // NOLINTBEGIN
-    ::ll::UntypedStorage<4, 4> mUnk3b898d;
+    ::ll::TypedStorage<4, 4, ::std::bitset<6>> mAllowedConnections;
     // NOLINTEND
 
-public:
-    // prevent constructor by default
-    DirectionalProducerComponent& operator=(DirectionalProducerComponent const&);
-    DirectionalProducerComponent(DirectionalProducerComponent const&);
-
 public:
     // virtual functions
     // NOLINTBEGIN