diff --git a/examples/platform/linux/testing/CustomCSRResponse.cpp b/examples/platform/linux/testing/CustomCSRResponse.cpp
index c8a3ba4f6fcbf9..ae7e76ae73b0dc 100644
--- a/examples/platform/linux/testing/CustomCSRResponse.cpp
+++ b/examples/platform/linux/testing/CustomCSRResponse.cpp
@@ -145,8 +145,11 @@ namespace app {
 namespace DataModel {
 
 template <>
-CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag, const CSRResponse::Type & responseData)
+CHIP_ERROR EncodeResponseCommandPayload(DataModel::TLVWriterWithAccessingFabricIndex & writerWithFabricIndex, TLV::Tag tag,
+                                        const CSRResponse::Type & responseData)
 {
+    TLV::TLVWriter & writer = writerWithFabricIndex;
+
     auto tag1      = TLV::ContextTag(CSRResponse::Fields::kNOCSRElements);
     auto tag2      = TLV::ContextTag(CSRResponse::Fields::kAttestationSignature);
     auto & options = LinuxDeviceOptions::GetInstance().mCSRResponseOptions;
diff --git a/src/app/CommandHandler.h b/src/app/CommandHandler.h
index 94ceb0197aecac..a18f3d03909609 100644
--- a/src/app/CommandHandler.h
+++ b/src/app/CommandHandler.h
@@ -302,16 +302,9 @@ class CommandHandler
     public:
         EncodableResponseCommandPayload(const CommandData & value) : mValue(value) {}
 
-        CHIP_ERROR EncodeTo(TLV::TLVWriter & writer, TLV::Tag tag, [[maybe_unused]] FabricIndex aAccessingFabricIndex) const final
+        CHIP_ERROR EncodeTo(DataModel::TLVWriterWithAccessingFabricIndex & writer, TLV::Tag tag) const final
         {
-            if constexpr (DataModel::IsFabricScoped<CommandData>::value)
-            {
-                return mValue.Encode(writer, tag, aAccessingFabricIndex);
-            }
-            else
-            {
-                return mValue.Encode(writer, tag);
-            }
+            return DataModel::EncodeResponseCommandPayload(writer, tag, mValue);
         }
 
         CHIP_ERROR EncodeTo(TLV::TLVWriter & writer, TLV::Tag tag) const final
diff --git a/src/app/CommandHandlerImpl.cpp b/src/app/CommandHandlerImpl.cpp
index 75d2fdf315e965..e2a4689f2882a2 100644
--- a/src/app/CommandHandlerImpl.cpp
+++ b/src/app/CommandHandlerImpl.cpp
@@ -156,7 +156,9 @@ CHIP_ERROR CommandHandlerImpl::TryAddResponseData(const ConcreteCommandPath & aR
         accessingFabricIndex = kUndefinedFabricIndex;
     }
 
-    ReturnErrorOnFailure(aEncodable.EncodeTo(*writer, TLV::ContextTag(CommandDataIB::Tag::kFields), accessingFabricIndex));
+    DataModel::TLVWriterWithAccessingFabricIndex responseWriter(*writer, accessingFabricIndex);
+
+    ReturnErrorOnFailure(aEncodable.EncodeTo(responseWriter, TLV::ContextTag(CommandDataIB::Tag::kFields)));
     return FinishCommand(/* aEndDataStruct = */ false);
 }
 
diff --git a/src/app/clusters/network-commissioning/network-commissioning.cpp b/src/app/clusters/network-commissioning/network-commissioning.cpp
index 6f21d609eaf326..0f0b3731d263c2 100644
--- a/src/app/clusters/network-commissioning/network-commissioning.cpp
+++ b/src/app/clusters/network-commissioning/network-commissioning.cpp
@@ -148,11 +148,6 @@ class WifiScanResponseToTLV : public chip::app::DataModel::EncodableToTLV
         mStatus(status), mDebugText(debugText), mNetworks(networks)
     {}
 
-    CHIP_ERROR EncodeTo(TLV::TLVWriter & writer, TLV::Tag tag, FabricIndex aAccessingFabricIndex) const override
-    {
-        return EncodeTo(writer, tag);
-    }
-
     CHIP_ERROR EncodeTo(TLV::TLVWriter & writer, TLV::Tag tag) const override;
 
 private:
@@ -219,11 +214,6 @@ class ThreadScanResponseToTLV : public chip::app::DataModel::EncodableToTLV
         mStatus(status), mDebugText(debugText), mNetworks(networks)
     {}
 
-    CHIP_ERROR EncodeTo(TLV::TLVWriter & writer, TLV::Tag tag, FabricIndex aAccessingFabricIndex) const override
-    {
-        return EncodeTo(writer, tag);
-    }
-
     CHIP_ERROR EncodeTo(TLV::TLVWriter & writer, TLV::Tag tag) const override;
 
 private:
diff --git a/src/app/data-model/EncodableToTLV.h b/src/app/data-model/EncodableToTLV.h
index 24fdb21fd363a5..6ea5d056bbcb84 100644
--- a/src/app/data-model/EncodableToTLV.h
+++ b/src/app/data-model/EncodableToTLV.h
@@ -33,11 +33,11 @@ class EncodableToTLV
 public:
     virtual ~EncodableToTLV() = default;
 
-    virtual CHIP_ERROR EncodeTo(TLV::TLVWriter & writer, TLV::Tag tag, FabricIndex aAccessingFabricIndex) const
+    virtual CHIP_ERROR EncodeTo(TLVWriterWithAccessingFabricIndex & writer, TLV::Tag tag) const
     {
         // By default, just ignore the fabric index.  Implementations that care
         // about it should override as needed.
-        return EncodeTo(writer, tag);
+        return EncodeTo(writer.mTLVWriter, tag);
     }
     virtual CHIP_ERROR EncodeTo(TLV::TLVWriter & writer, TLV::Tag tag) const = 0;
 };
diff --git a/src/app/data-model/Encode.h b/src/app/data-model/Encode.h
index 7cb8298e47ac72..def065f3cee207 100644
--- a/src/app/data-model/Encode.h
+++ b/src/app/data-model/Encode.h
@@ -253,6 +253,31 @@ CHIP_ERROR EncodeForRead(TLV::TLVWriter & writer, TLV::Tag tag, FabricIndex acce
 #pragma GCC diagnostic pop
 }
 
+// TODO: Needs better name?  And should it be declared in a separate header?
+struct TLVWriterWithAccessingFabricIndex
+{
+    TLVWriterWithAccessingFabricIndex(TLV::TLVWriter & writer, FabricIndex accessingFabricIndex) :
+        mTLVWriter(writer), mAccessingFabricIndex(accessingFabricIndex)
+    {}
+
+    operator TLV::TLVWriter &() { return mTLVWriter; }
+
+    TLV::TLVWriter & mTLVWriter;
+    const FabricIndex mAccessingFabricIndex;
+};
+
+/**
+ * @brief
+ *
+ * Encodes a response command payload. This is a templated function to allow
+ * specializations to be created as needed to customize the behavior.
+ */
+template <typename PayloadType>
+CHIP_ERROR EncodeResponseCommandPayload(TLVWriterWithAccessingFabricIndex & writer, TLV::Tag tag, const PayloadType & payload)
+{
+    return payload.Encode(writer, tag);
+}
+
 } // namespace DataModel
 } // namespace app
 } // namespace chip
diff --git a/src/app/zap-templates/templates/app/clusters-Commands.h.zapt b/src/app/zap-templates/templates/app/clusters-Commands.h.zapt
index 83a79b57ef7469..86f9481955b388 100644
--- a/src/app/zap-templates/templates/app/clusters-Commands.h.zapt
+++ b/src/app/zap-templates/templates/app/clusters-Commands.h.zapt
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/Nullable.h>
 #include <app/data-model/NullObject.h>
@@ -66,14 +67,10 @@ public:
     {{/zcl_command_arguments}}
 
 
-    {{#if isFabricScoped~}}
-    {{#if (isServer source)}}
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag, FabricIndex aAccessingFabricIndex) const;
-    {{else}}
+    {{#if (isClient source)}}
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-    {{/if}}
     {{else}}
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
     {{/if}}
 
     using ResponseType =
@@ -96,8 +93,8 @@ public:
     {{zapTypeToDecodableClusterObjectType type cluster=../../name}} {{asLowerCamelCase label}}{{> cluster_objects_field_init cluster=../../name}};
     {{/zcl_command_arguments}}
 
-    {{#if isFabricScoped~}}
     {{#if (isClient source)}}
+    {{#if isFabricScoped~}}
     CHIP_ERROR Decode(TLV::TLVReader &reader, FabricIndex aAccessingFabricIndex);
     {{else}}
     CHIP_ERROR Decode(TLV::TLVReader &reader);
diff --git a/src/app/zap-templates/templates/app/clusters-Commands.ipp.zapt b/src/app/zap-templates/templates/app/clusters-Commands.ipp.zapt
index bdb110a1711a04..ccf3481139ddda 100644
--- a/src/app/zap-templates/templates/app/clusters-Commands.ipp.zapt
+++ b/src/app/zap-templates/templates/app/clusters-Commands.ipp.zapt
@@ -15,14 +15,10 @@ namespace Commands {
 {{#zcl_commands}}
 namespace {{asUpperCamelCase name}} {
 
-{{#if isFabricScoped~}}
-{{#if (isServer source)}}
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag, FabricIndex aAccessingFabricIndex) const {
-{{else}}
+{{#if (isClient source)}}
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const {
-{{/if}}
 {{else}}
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const {
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const {
 {{/if}}
     DataModel::WrappedStructEncoder encoder{aWriter, aTag};
     {{#zcl_command_arguments~}}
@@ -31,7 +27,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const {
     {{#if (isClient parent.source)}}
     encoder.EncodeRequestCommandFabricScopedStructField(to_underlying(Fields::k{{asUpperCamelCase label}}), {{asLowerCamelCase label}});
     {{else}}
-    encoder.EncodeResponseCommandFabricScopedStructField(to_underlying(Fields::k{{asUpperCamelCase label}}), aAccessingFabricIndex, {{asLowerCamelCase label}});
+    encoder.EncodeResponseCommandFabricScopedStructField(to_underlying(Fields::k{{asUpperCamelCase label}}), aWriter.mAccessingFabricIndex, {{asLowerCamelCase label}});
     {{/if}}
     {{else}}
     encoder.Encode(to_underlying(Fields::k{{asUpperCamelCase label}}), {{asLowerCamelCase label}});
@@ -41,8 +37,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const {
     return encoder.Finalize();
 }
 
-{{#if isFabricScoped~}}
 {{#if (isClient source)}}
+{{#if isFabricScoped~}}
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader &reader, FabricIndex aAccessingFabricIndex) {
 {{else}}
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader &reader) {
diff --git a/zzz_generated/app-common/clusters/AccessControl/Commands.h b/zzz_generated/app-common/clusters/AccessControl/Commands.h
index 7877174f5862ed..198741b26fee63 100644
--- a/zzz_generated/app-common/clusters/AccessControl/Commands.h
+++ b/zzz_generated/app-common/clusters/AccessControl/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -110,7 +111,7 @@ struct Type
 
     uint64_t token = static_cast<uint64_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/AccessControl/Commands.ipp b/zzz_generated/app-common/clusters/AccessControl/Commands.ipp
index 19f0704d1d598c..85b8bc7efb5469 100644
--- a/zzz_generated/app-common/clusters/AccessControl/Commands.ipp
+++ b/zzz_generated/app-common/clusters/AccessControl/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace ReviewFabricRestrictions.
 namespace ReviewFabricRestrictionsResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kToken), token);
diff --git a/zzz_generated/app-common/clusters/AccountLogin/Commands.h b/zzz_generated/app-common/clusters/AccountLogin/Commands.h
index a93ca298edb801..553ec62667c5e3 100644
--- a/zzz_generated/app-common/clusters/AccountLogin/Commands.h
+++ b/zzz_generated/app-common/clusters/AccountLogin/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -120,7 +121,7 @@ struct Type
 
     chip::CharSpan setupPIN;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag, FabricIndex aAccessingFabricIndex) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/AccountLogin/Commands.ipp b/zzz_generated/app-common/clusters/AccountLogin/Commands.ipp
index 9c6e4e63f54466..02aa166916ae4b 100644
--- a/zzz_generated/app-common/clusters/AccountLogin/Commands.ipp
+++ b/zzz_generated/app-common/clusters/AccountLogin/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace GetSetupPIN.
 namespace GetSetupPINResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag, FabricIndex aAccessingFabricIndex) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kSetupPIN), setupPIN);
diff --git a/zzz_generated/app-common/clusters/Actions/Commands.h b/zzz_generated/app-common/clusters/Actions/Commands.h
index 3ee79f7301b947..9e67a482b796b4 100644
--- a/zzz_generated/app-common/clusters/Actions/Commands.h
+++ b/zzz_generated/app-common/clusters/Actions/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ActivatedCarbonFilterMonitoring/Commands.h b/zzz_generated/app-common/clusters/ActivatedCarbonFilterMonitoring/Commands.h
index 39ca504cf9f20c..a8f1674219ff42 100644
--- a/zzz_generated/app-common/clusters/ActivatedCarbonFilterMonitoring/Commands.h
+++ b/zzz_generated/app-common/clusters/ActivatedCarbonFilterMonitoring/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/AdministratorCommissioning/Commands.h b/zzz_generated/app-common/clusters/AdministratorCommissioning/Commands.h
index c6910de26f6df1..71960e47c9e5b8 100644
--- a/zzz_generated/app-common/clusters/AdministratorCommissioning/Commands.h
+++ b/zzz_generated/app-common/clusters/AdministratorCommissioning/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/AirQuality/Commands.h b/zzz_generated/app-common/clusters/AirQuality/Commands.h
index b87600f03f1101..5874a3dd32584e 100644
--- a/zzz_generated/app-common/clusters/AirQuality/Commands.h
+++ b/zzz_generated/app-common/clusters/AirQuality/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ApplicationBasic/Commands.h b/zzz_generated/app-common/clusters/ApplicationBasic/Commands.h
index 9add5e6518b487..7869b34bf32e6b 100644
--- a/zzz_generated/app-common/clusters/ApplicationBasic/Commands.h
+++ b/zzz_generated/app-common/clusters/ApplicationBasic/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ApplicationLauncher/Commands.h b/zzz_generated/app-common/clusters/ApplicationLauncher/Commands.h
index 223a250a8498c7..02bd61e5ffc4cb 100644
--- a/zzz_generated/app-common/clusters/ApplicationLauncher/Commands.h
+++ b/zzz_generated/app-common/clusters/ApplicationLauncher/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -195,7 +196,7 @@ struct Type
     StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::ByteSpan> data;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/ApplicationLauncher/Commands.ipp b/zzz_generated/app-common/clusters/ApplicationLauncher/Commands.ipp
index 4dcedb5884abf2..b65db58140c7f0 100644
--- a/zzz_generated/app-common/clusters/ApplicationLauncher/Commands.ipp
+++ b/zzz_generated/app-common/clusters/ApplicationLauncher/Commands.ipp
@@ -120,7 +120,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace HideApp.
 namespace LauncherResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/AudioOutput/Commands.h b/zzz_generated/app-common/clusters/AudioOutput/Commands.h
index 86364f521eb226..51db9e6d54fc99 100644
--- a/zzz_generated/app-common/clusters/AudioOutput/Commands.h
+++ b/zzz_generated/app-common/clusters/AudioOutput/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/BallastConfiguration/Commands.h b/zzz_generated/app-common/clusters/BallastConfiguration/Commands.h
index cf0fc3fa35b626..1fbab75a318947 100644
--- a/zzz_generated/app-common/clusters/BallastConfiguration/Commands.h
+++ b/zzz_generated/app-common/clusters/BallastConfiguration/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/BasicInformation/Commands.h b/zzz_generated/app-common/clusters/BasicInformation/Commands.h
index 789d340ce63cf9..7b0357bb2769a7 100644
--- a/zzz_generated/app-common/clusters/BasicInformation/Commands.h
+++ b/zzz_generated/app-common/clusters/BasicInformation/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/Binding/Commands.h b/zzz_generated/app-common/clusters/Binding/Commands.h
index 0816233c5827df..1aadf44b469690 100644
--- a/zzz_generated/app-common/clusters/Binding/Commands.h
+++ b/zzz_generated/app-common/clusters/Binding/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/BooleanState/Commands.h b/zzz_generated/app-common/clusters/BooleanState/Commands.h
index db10bd4243530d..a35dd5ed182c83 100644
--- a/zzz_generated/app-common/clusters/BooleanState/Commands.h
+++ b/zzz_generated/app-common/clusters/BooleanState/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/BooleanStateConfiguration/Commands.h b/zzz_generated/app-common/clusters/BooleanStateConfiguration/Commands.h
index b0cb21fd2bd8ff..dd8dba91775854 100644
--- a/zzz_generated/app-common/clusters/BooleanStateConfiguration/Commands.h
+++ b/zzz_generated/app-common/clusters/BooleanStateConfiguration/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/BridgedDeviceBasicInformation/Commands.h b/zzz_generated/app-common/clusters/BridgedDeviceBasicInformation/Commands.h
index e7755473ae1938..fbe30345bc28a7 100644
--- a/zzz_generated/app-common/clusters/BridgedDeviceBasicInformation/Commands.h
+++ b/zzz_generated/app-common/clusters/BridgedDeviceBasicInformation/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/CameraAvSettingsUserLevelManagement/Commands.h b/zzz_generated/app-common/clusters/CameraAvSettingsUserLevelManagement/Commands.h
index 198005a0cf2b87..59c7556937d792 100644
--- a/zzz_generated/app-common/clusters/CameraAvSettingsUserLevelManagement/Commands.h
+++ b/zzz_generated/app-common/clusters/CameraAvSettingsUserLevelManagement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/CameraAvStreamManagement/Commands.h b/zzz_generated/app-common/clusters/CameraAvStreamManagement/Commands.h
index 16614e27d8b997..c5aa82c83e23c8 100644
--- a/zzz_generated/app-common/clusters/CameraAvStreamManagement/Commands.h
+++ b/zzz_generated/app-common/clusters/CameraAvStreamManagement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -185,7 +186,7 @@ struct Type
 
     uint16_t audioStreamID = static_cast<uint16_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -323,7 +324,7 @@ struct Type
 
     uint16_t videoStreamID = static_cast<uint16_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -487,7 +488,7 @@ struct Type
 
     uint16_t snapshotStreamID = static_cast<uint16_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -675,7 +676,7 @@ struct Type
     ImageCodecEnum imageCodec = static_cast<ImageCodecEnum>(0);
     Structs::VideoResolutionStruct::Type resolution;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/CameraAvStreamManagement/Commands.ipp b/zzz_generated/app-common/clusters/CameraAvStreamManagement/Commands.ipp
index 3e363a4c9b4b62..83fc89fa076539 100644
--- a/zzz_generated/app-common/clusters/CameraAvStreamManagement/Commands.ipp
+++ b/zzz_generated/app-common/clusters/CameraAvStreamManagement/Commands.ipp
@@ -84,7 +84,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace AudioStreamAllocate.
 namespace AudioStreamAllocateResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kAudioStreamID), audioStreamID);
@@ -223,7 +223,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace VideoStreamAllocate.
 namespace VideoStreamAllocateResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kVideoStreamID), videoStreamID);
@@ -375,7 +375,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace SnapshotStreamAllocate.
 namespace SnapshotStreamAllocateResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kSnapshotStreamID), snapshotStreamID);
@@ -530,7 +530,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace CaptureSnapshot.
 namespace CaptureSnapshotResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kData), data);
diff --git a/zzz_generated/app-common/clusters/CarbonDioxideConcentrationMeasurement/Commands.h b/zzz_generated/app-common/clusters/CarbonDioxideConcentrationMeasurement/Commands.h
index 7e401ca6e03beb..524a460450880e 100644
--- a/zzz_generated/app-common/clusters/CarbonDioxideConcentrationMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/CarbonDioxideConcentrationMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/CarbonMonoxideConcentrationMeasurement/Commands.h b/zzz_generated/app-common/clusters/CarbonMonoxideConcentrationMeasurement/Commands.h
index 692835cf8e82c9..266e9d43cf588e 100644
--- a/zzz_generated/app-common/clusters/CarbonMonoxideConcentrationMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/CarbonMonoxideConcentrationMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/Channel/Commands.h b/zzz_generated/app-common/clusters/Channel/Commands.h
index 374cf9b8a7e179..b2b6ffd0a9b420 100644
--- a/zzz_generated/app-common/clusters/Channel/Commands.h
+++ b/zzz_generated/app-common/clusters/Channel/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -142,7 +143,7 @@ struct Type
     StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::CharSpan> data;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -306,7 +307,7 @@ struct Type
     Structs::ChannelPagingStruct::Type paging;
     DataModel::List<const Structs::ProgramStruct::Type> programList;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/Channel/Commands.ipp b/zzz_generated/app-common/clusters/Channel/Commands.ipp
index e22cc1ae1bf33a..39e67a253b5890 100644
--- a/zzz_generated/app-common/clusters/Channel/Commands.ipp
+++ b/zzz_generated/app-common/clusters/Channel/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ChangeChannel.
 namespace ChangeChannelResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
@@ -211,7 +211,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace GetProgramGuide.
 namespace ProgramGuideResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kPaging), paging);
diff --git a/zzz_generated/app-common/clusters/Chime/Commands.h b/zzz_generated/app-common/clusters/Chime/Commands.h
index bc6f36ca92478f..41d295190baf4e 100644
--- a/zzz_generated/app-common/clusters/Chime/Commands.h
+++ b/zzz_generated/app-common/clusters/Chime/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ClosureControl/Commands.h b/zzz_generated/app-common/clusters/ClosureControl/Commands.h
index 755d2d22ad0921..73e0f9a5d53483 100644
--- a/zzz_generated/app-common/clusters/ClosureControl/Commands.h
+++ b/zzz_generated/app-common/clusters/ClosureControl/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ClosureDimension/Commands.h b/zzz_generated/app-common/clusters/ClosureDimension/Commands.h
index c1806f83a8db5f..f067a712e749e5 100644
--- a/zzz_generated/app-common/clusters/ClosureDimension/Commands.h
+++ b/zzz_generated/app-common/clusters/ClosureDimension/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ColorControl/Commands.h b/zzz_generated/app-common/clusters/ColorControl/Commands.h
index 40bce634348549..90109511378728 100644
--- a/zzz_generated/app-common/clusters/ColorControl/Commands.h
+++ b/zzz_generated/app-common/clusters/ColorControl/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/CommissionerControl/Commands.h b/zzz_generated/app-common/clusters/CommissionerControl/Commands.h
index 582a03becaca3f..84d7099f061d5e 100644
--- a/zzz_generated/app-common/clusters/CommissionerControl/Commands.h
+++ b/zzz_generated/app-common/clusters/CommissionerControl/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -170,7 +171,7 @@ struct Type
     uint32_t iterations    = static_cast<uint32_t>(0);
     chip::ByteSpan salt;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/CommissionerControl/Commands.ipp b/zzz_generated/app-common/clusters/CommissionerControl/Commands.ipp
index 858159e3f8826e..a6ec8a159c4b80 100644
--- a/zzz_generated/app-common/clusters/CommissionerControl/Commands.ipp
+++ b/zzz_generated/app-common/clusters/CommissionerControl/Commands.ipp
@@ -107,7 +107,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace CommissionNode.
 namespace ReverseOpenCommissioningWindow {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kCommissioningTimeout), commissioningTimeout);
diff --git a/zzz_generated/app-common/clusters/CommodityMetering/Commands.h b/zzz_generated/app-common/clusters/CommodityMetering/Commands.h
index 0fff7a3aedfc95..f66e3e74389f58 100644
--- a/zzz_generated/app-common/clusters/CommodityMetering/Commands.h
+++ b/zzz_generated/app-common/clusters/CommodityMetering/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/CommodityPrice/Commands.h b/zzz_generated/app-common/clusters/CommodityPrice/Commands.h
index fc2be6b73f4616..bd2b753a61bc4f 100644
--- a/zzz_generated/app-common/clusters/CommodityPrice/Commands.h
+++ b/zzz_generated/app-common/clusters/CommodityPrice/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -120,7 +121,7 @@ struct Type
 
     DataModel::Nullable<Structs::CommodityPriceStruct::Type> currentPrice;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -190,7 +191,7 @@ struct Type
 
     DataModel::List<const Structs::CommodityPriceStruct::Type> priceForecast;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/CommodityPrice/Commands.ipp b/zzz_generated/app-common/clusters/CommodityPrice/Commands.ipp
index e8a19924b76798..522fb899df8c3f 100644
--- a/zzz_generated/app-common/clusters/CommodityPrice/Commands.ipp
+++ b/zzz_generated/app-common/clusters/CommodityPrice/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace GetDetailedPriceRequest.
 namespace GetDetailedPriceResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kCurrentPrice), currentPrice);
@@ -115,7 +115,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace GetDetailedForecastRequest.
 namespace GetDetailedForecastResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kPriceForecast), priceForecast);
diff --git a/zzz_generated/app-common/clusters/CommodityTariff/Commands.h b/zzz_generated/app-common/clusters/CommodityTariff/Commands.h
index b089dd4e7b4621..50df479a7ae415 100644
--- a/zzz_generated/app-common/clusters/CommodityTariff/Commands.h
+++ b/zzz_generated/app-common/clusters/CommodityTariff/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -124,7 +125,7 @@ struct Type
     DataModel::List<const uint32_t> dayEntryIDs;
     Structs::TariffComponentStruct::Type tariffComponent;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -196,7 +197,7 @@ struct Type
 
     Structs::DayEntryStruct::Type dayEntry;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/CommodityTariff/Commands.ipp b/zzz_generated/app-common/clusters/CommodityTariff/Commands.ipp
index f93ef292806ec3..4ea41f7e8762be 100644
--- a/zzz_generated/app-common/clusters/CommodityTariff/Commands.ipp
+++ b/zzz_generated/app-common/clusters/CommodityTariff/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace GetTariffComponent.
 namespace GetTariffComponentResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kLabel), label);
@@ -125,7 +125,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace GetDayEntry.
 namespace GetDayEntryResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kDayEntry), dayEntry);
diff --git a/zzz_generated/app-common/clusters/ContentAppObserver/Commands.h b/zzz_generated/app-common/clusters/ContentAppObserver/Commands.h
index 8a66416a867019..6224f2e5e035f1 100644
--- a/zzz_generated/app-common/clusters/ContentAppObserver/Commands.h
+++ b/zzz_generated/app-common/clusters/ContentAppObserver/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -117,7 +118,7 @@ struct Type
     Optional<chip::CharSpan> data;
     Optional<chip::CharSpan> encodingHint;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/ContentAppObserver/Commands.ipp b/zzz_generated/app-common/clusters/ContentAppObserver/Commands.ipp
index e0a87b2839611f..839b521e60e55f 100644
--- a/zzz_generated/app-common/clusters/ContentAppObserver/Commands.ipp
+++ b/zzz_generated/app-common/clusters/ContentAppObserver/Commands.ipp
@@ -64,7 +64,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ContentAppMessage.
 namespace ContentAppMessageResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/ContentControl/Commands.h b/zzz_generated/app-common/clusters/ContentControl/Commands.h
index 6a6ffbab2e216d..99decb3c4aa1ad 100644
--- a/zzz_generated/app-common/clusters/ContentControl/Commands.h
+++ b/zzz_generated/app-common/clusters/ContentControl/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -188,7 +189,7 @@ struct Type
 
     chip::CharSpan PINCode;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/ContentControl/Commands.ipp b/zzz_generated/app-common/clusters/ContentControl/Commands.ipp
index 4fd6fbb83f33ee..13d500f8f1ceb5 100644
--- a/zzz_generated/app-common/clusters/ContentControl/Commands.ipp
+++ b/zzz_generated/app-common/clusters/ContentControl/Commands.ipp
@@ -86,7 +86,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ResetPIN.
 namespace ResetPINResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kPINCode), PINCode);
diff --git a/zzz_generated/app-common/clusters/ContentLauncher/Commands.h b/zzz_generated/app-common/clusters/ContentLauncher/Commands.h
index c49a544938d9ce..2e1edea90efcbd 100644
--- a/zzz_generated/app-common/clusters/ContentLauncher/Commands.h
+++ b/zzz_generated/app-common/clusters/ContentLauncher/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -170,7 +171,7 @@ struct Type
     StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::CharSpan> data;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/ContentLauncher/Commands.ipp b/zzz_generated/app-common/clusters/ContentLauncher/Commands.ipp
index 52ebb98ccd4dae..acc396872025e5 100644
--- a/zzz_generated/app-common/clusters/ContentLauncher/Commands.ipp
+++ b/zzz_generated/app-common/clusters/ContentLauncher/Commands.ipp
@@ -117,7 +117,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace LaunchURL.
 namespace LauncherResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/Descriptor/Commands.h b/zzz_generated/app-common/clusters/Descriptor/Commands.h
index 784cafb4c5bcd2..d8a6c106440f88 100644
--- a/zzz_generated/app-common/clusters/Descriptor/Commands.h
+++ b/zzz_generated/app-common/clusters/Descriptor/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/DeviceEnergyManagement/Commands.h b/zzz_generated/app-common/clusters/DeviceEnergyManagement/Commands.h
index 25e27a707651c4..0012c274b29d0e 100644
--- a/zzz_generated/app-common/clusters/DeviceEnergyManagement/Commands.h
+++ b/zzz_generated/app-common/clusters/DeviceEnergyManagement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/DeviceEnergyManagementMode/Commands.h b/zzz_generated/app-common/clusters/DeviceEnergyManagementMode/Commands.h
index 1956221995b23b..628f192ae5f2be 100644
--- a/zzz_generated/app-common/clusters/DeviceEnergyManagementMode/Commands.h
+++ b/zzz_generated/app-common/clusters/DeviceEnergyManagementMode/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -112,7 +113,7 @@ struct Type
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/DeviceEnergyManagementMode/Commands.ipp b/zzz_generated/app-common/clusters/DeviceEnergyManagementMode/Commands.ipp
index 6c07e5352db17c..44f62e92932cb4 100644
--- a/zzz_generated/app-common/clusters/DeviceEnergyManagementMode/Commands.ipp
+++ b/zzz_generated/app-common/clusters/DeviceEnergyManagementMode/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ChangeToMode.
 namespace ChangeToModeResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/DiagnosticLogs/Commands.h b/zzz_generated/app-common/clusters/DiagnosticLogs/Commands.h
index 4a2e4314cf7ef8..41647f1d1fdba2 100644
--- a/zzz_generated/app-common/clusters/DiagnosticLogs/Commands.h
+++ b/zzz_generated/app-common/clusters/DiagnosticLogs/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -122,7 +123,7 @@ struct Type
     Optional<uint64_t> UTCTimeStamp;
     Optional<uint64_t> timeSinceBoot;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/DiagnosticLogs/Commands.ipp b/zzz_generated/app-common/clusters/DiagnosticLogs/Commands.ipp
index b69dca79f87943..a8f9ce5057b169 100644
--- a/zzz_generated/app-common/clusters/DiagnosticLogs/Commands.ipp
+++ b/zzz_generated/app-common/clusters/DiagnosticLogs/Commands.ipp
@@ -69,7 +69,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace RetrieveLogsRequest.
 namespace RetrieveLogsResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/DishwasherAlarm/Commands.h b/zzz_generated/app-common/clusters/DishwasherAlarm/Commands.h
index c36bfd74853564..1c65978cc1f516 100644
--- a/zzz_generated/app-common/clusters/DishwasherAlarm/Commands.h
+++ b/zzz_generated/app-common/clusters/DishwasherAlarm/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/DishwasherMode/Commands.h b/zzz_generated/app-common/clusters/DishwasherMode/Commands.h
index fdb0d9ea97d8f9..47f48f02785e9f 100644
--- a/zzz_generated/app-common/clusters/DishwasherMode/Commands.h
+++ b/zzz_generated/app-common/clusters/DishwasherMode/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -112,7 +113,7 @@ struct Type
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/DishwasherMode/Commands.ipp b/zzz_generated/app-common/clusters/DishwasherMode/Commands.ipp
index 5aa997da816846..746009abcaa9be 100644
--- a/zzz_generated/app-common/clusters/DishwasherMode/Commands.ipp
+++ b/zzz_generated/app-common/clusters/DishwasherMode/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ChangeToMode.
 namespace ChangeToModeResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/DoorLock/Commands.h b/zzz_generated/app-common/clusters/DoorLock/Commands.h
index 040017b2f508c2..8c5abd4576b29f 100644
--- a/zzz_generated/app-common/clusters/DoorLock/Commands.h
+++ b/zzz_generated/app-common/clusters/DoorLock/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -413,7 +414,7 @@ struct Type
     Optional<uint8_t> endHour;
     Optional<uint8_t> endMinute;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -583,7 +584,7 @@ struct Type
     Optional<uint32_t> localStartTime;
     Optional<uint32_t> localEndTime;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -747,7 +748,7 @@ struct Type
     Optional<uint32_t> localEndTime;
     Optional<OperatingModeEnum> operatingMode;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -927,7 +928,7 @@ struct Type
     DataModel::Nullable<chip::FabricIndex> lastModifiedFabricIndex;
     DataModel::Nullable<uint16_t> nextUserIndex;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -1060,7 +1061,7 @@ struct Type
     DataModel::Nullable<uint16_t> userIndex;
     DataModel::Nullable<uint16_t> nextCredentialIndex;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -1142,7 +1143,7 @@ struct Type
     DataModel::Nullable<uint16_t> nextCredentialIndex;
     Optional<DataModel::Nullable<chip::ByteSpan>> credentialData;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/DoorLock/Commands.ipp b/zzz_generated/app-common/clusters/DoorLock/Commands.ipp
index 03f0adebaf0501..a4196c90b3204e 100644
--- a/zzz_generated/app-common/clusters/DoorLock/Commands.ipp
+++ b/zzz_generated/app-common/clusters/DoorLock/Commands.ipp
@@ -211,7 +211,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace GetWeekDaySchedule.
 namespace GetWeekDayScheduleResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kWeekDayIndex), weekDayIndex);
@@ -383,7 +383,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace GetYearDaySchedule.
 namespace GetYearDayScheduleResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kYearDayIndex), yearDayIndex);
@@ -535,7 +535,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace GetHolidaySchedule.
 namespace GetHolidayScheduleResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kHolidayIndex), holidayIndex);
@@ -697,7 +697,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace GetUser.
 namespace GetUserResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kUserIndex), userIndex);
@@ -851,7 +851,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace SetCredential.
 namespace SetCredentialResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
@@ -917,7 +917,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace GetCredentialStatus.
 namespace GetCredentialStatusResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kCredentialExists), credentialExists);
diff --git a/zzz_generated/app-common/clusters/EcosystemInformation/Commands.h b/zzz_generated/app-common/clusters/EcosystemInformation/Commands.h
index df6178399a7e40..ca798382f12925 100644
--- a/zzz_generated/app-common/clusters/EcosystemInformation/Commands.h
+++ b/zzz_generated/app-common/clusters/EcosystemInformation/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ElectricalEnergyMeasurement/Commands.h b/zzz_generated/app-common/clusters/ElectricalEnergyMeasurement/Commands.h
index 96189474e59321..4e389c1a41325d 100644
--- a/zzz_generated/app-common/clusters/ElectricalEnergyMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/ElectricalEnergyMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ElectricalGridConditions/Commands.h b/zzz_generated/app-common/clusters/ElectricalGridConditions/Commands.h
index 4ef5c27f77d00d..8a3385a233e84f 100644
--- a/zzz_generated/app-common/clusters/ElectricalGridConditions/Commands.h
+++ b/zzz_generated/app-common/clusters/ElectricalGridConditions/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ElectricalPowerMeasurement/Commands.h b/zzz_generated/app-common/clusters/ElectricalPowerMeasurement/Commands.h
index 9ca87f6455f1ef..736fe0363fb972 100644
--- a/zzz_generated/app-common/clusters/ElectricalPowerMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/ElectricalPowerMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/EnergyEvse/Commands.h b/zzz_generated/app-common/clusters/EnergyEvse/Commands.h
index ceae7c64da69e4..79599e82e846b9 100644
--- a/zzz_generated/app-common/clusters/EnergyEvse/Commands.h
+++ b/zzz_generated/app-common/clusters/EnergyEvse/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -105,7 +106,7 @@ struct Type
 
     DataModel::List<const Structs::ChargingTargetScheduleStruct::Type> chargingTargetSchedules;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/EnergyEvse/Commands.ipp b/zzz_generated/app-common/clusters/EnergyEvse/Commands.ipp
index a4068feeecc9cf..9497e3db6e0bf4 100644
--- a/zzz_generated/app-common/clusters/EnergyEvse/Commands.ipp
+++ b/zzz_generated/app-common/clusters/EnergyEvse/Commands.ipp
@@ -31,7 +31,7 @@ namespace EnergyEvse {
 namespace Commands {
 namespace GetTargetsResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kChargingTargetSchedules), chargingTargetSchedules);
diff --git a/zzz_generated/app-common/clusters/EnergyEvseMode/Commands.h b/zzz_generated/app-common/clusters/EnergyEvseMode/Commands.h
index c5753f007acf23..dd2f810d414fef 100644
--- a/zzz_generated/app-common/clusters/EnergyEvseMode/Commands.h
+++ b/zzz_generated/app-common/clusters/EnergyEvseMode/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -112,7 +113,7 @@ struct Type
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/EnergyEvseMode/Commands.ipp b/zzz_generated/app-common/clusters/EnergyEvseMode/Commands.ipp
index 7b0236369334a2..b40fb2e704603b 100644
--- a/zzz_generated/app-common/clusters/EnergyEvseMode/Commands.ipp
+++ b/zzz_generated/app-common/clusters/EnergyEvseMode/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ChangeToMode.
 namespace ChangeToModeResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/EnergyPreference/Commands.h b/zzz_generated/app-common/clusters/EnergyPreference/Commands.h
index 1e9346b5e3bc19..77c0eae1946de4 100644
--- a/zzz_generated/app-common/clusters/EnergyPreference/Commands.h
+++ b/zzz_generated/app-common/clusters/EnergyPreference/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/EthernetNetworkDiagnostics/Commands.h b/zzz_generated/app-common/clusters/EthernetNetworkDiagnostics/Commands.h
index d68a009740c6ae..72cd3f0995bdb2 100644
--- a/zzz_generated/app-common/clusters/EthernetNetworkDiagnostics/Commands.h
+++ b/zzz_generated/app-common/clusters/EthernetNetworkDiagnostics/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/FanControl/Commands.h b/zzz_generated/app-common/clusters/FanControl/Commands.h
index cd47d87b74d6fd..0fe885038804d4 100644
--- a/zzz_generated/app-common/clusters/FanControl/Commands.h
+++ b/zzz_generated/app-common/clusters/FanControl/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/FaultInjection/Commands.h b/zzz_generated/app-common/clusters/FaultInjection/Commands.h
index 2371057dcc1d82..175bdd10ec8dc4 100644
--- a/zzz_generated/app-common/clusters/FaultInjection/Commands.h
+++ b/zzz_generated/app-common/clusters/FaultInjection/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/FixedLabel/Commands.h b/zzz_generated/app-common/clusters/FixedLabel/Commands.h
index 89e78489cbc15c..d3cea640244549 100644
--- a/zzz_generated/app-common/clusters/FixedLabel/Commands.h
+++ b/zzz_generated/app-common/clusters/FixedLabel/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/FlowMeasurement/Commands.h b/zzz_generated/app-common/clusters/FlowMeasurement/Commands.h
index da3c331a543e17..e7c18d2d8a4c84 100644
--- a/zzz_generated/app-common/clusters/FlowMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/FlowMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/FormaldehydeConcentrationMeasurement/Commands.h b/zzz_generated/app-common/clusters/FormaldehydeConcentrationMeasurement/Commands.h
index b88874ba913232..8d8ae75096d277 100644
--- a/zzz_generated/app-common/clusters/FormaldehydeConcentrationMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/FormaldehydeConcentrationMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/GeneralCommissioning/Commands.h b/zzz_generated/app-common/clusters/GeneralCommissioning/Commands.h
index 54e6b54d4e5c7a..8e69061518a02b 100644
--- a/zzz_generated/app-common/clusters/GeneralCommissioning/Commands.h
+++ b/zzz_generated/app-common/clusters/GeneralCommissioning/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -145,7 +146,7 @@ struct Type
     CommissioningErrorEnum errorCode = static_cast<CommissioningErrorEnum>(0);
     chip::CharSpan debugText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -224,7 +225,7 @@ struct Type
     CommissioningErrorEnum errorCode = static_cast<CommissioningErrorEnum>(0);
     chip::CharSpan debugText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -292,7 +293,7 @@ struct Type
     CommissioningErrorEnum errorCode = static_cast<CommissioningErrorEnum>(0);
     chip::CharSpan debugText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -366,7 +367,7 @@ struct Type
 
     CommissioningErrorEnum errorCode = static_cast<CommissioningErrorEnum>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/GeneralCommissioning/Commands.ipp b/zzz_generated/app-common/clusters/GeneralCommissioning/Commands.ipp
index 2efc919465b214..3b2bbb17229257 100644
--- a/zzz_generated/app-common/clusters/GeneralCommissioning/Commands.ipp
+++ b/zzz_generated/app-common/clusters/GeneralCommissioning/Commands.ipp
@@ -64,7 +64,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ArmFailSafe.
 namespace ArmFailSafeResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kErrorCode), errorCode);
@@ -135,7 +135,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace SetRegulatoryConfig.
 namespace SetRegulatoryConfigResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kErrorCode), errorCode);
@@ -190,7 +190,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace CommissioningComplete.
 namespace CommissioningCompleteResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kErrorCode), errorCode);
@@ -256,7 +256,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace SetTCAcknowledgements.
 namespace SetTCAcknowledgementsResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kErrorCode), errorCode);
diff --git a/zzz_generated/app-common/clusters/GeneralDiagnostics/Commands.h b/zzz_generated/app-common/clusters/GeneralDiagnostics/Commands.h
index 4b1a23673c84b7..830522a9ac3554 100644
--- a/zzz_generated/app-common/clusters/GeneralDiagnostics/Commands.h
+++ b/zzz_generated/app-common/clusters/GeneralDiagnostics/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -160,7 +161,7 @@ struct Type
     uint64_t systemTimeMs = static_cast<uint64_t>(0);
     DataModel::Nullable<uint64_t> posixTimeMs;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -237,7 +238,7 @@ struct Type
 
     chip::ByteSpan payload;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/GeneralDiagnostics/Commands.ipp b/zzz_generated/app-common/clusters/GeneralDiagnostics/Commands.ipp
index 0b3535fdad0a66..daf13c0caf1974 100644
--- a/zzz_generated/app-common/clusters/GeneralDiagnostics/Commands.ipp
+++ b/zzz_generated/app-common/clusters/GeneralDiagnostics/Commands.ipp
@@ -86,7 +86,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TimeSnapshot.
 namespace TimeSnapshotResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kSystemTimeMs), systemTimeMs);
@@ -157,7 +157,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace PayloadTestRequest.
 namespace PayloadTestResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kPayload), payload);
diff --git a/zzz_generated/app-common/clusters/GroupKeyManagement/Commands.h b/zzz_generated/app-common/clusters/GroupKeyManagement/Commands.h
index 446ece87c6b4a7..9c1f1be6abe346 100644
--- a/zzz_generated/app-common/clusters/GroupKeyManagement/Commands.h
+++ b/zzz_generated/app-common/clusters/GroupKeyManagement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -165,7 +166,7 @@ struct Type
 
     Structs::GroupKeySetStruct::Type groupKeySet;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -265,7 +266,7 @@ struct Type
 
     DataModel::List<const uint16_t> groupKeySetIDs;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/GroupKeyManagement/Commands.ipp b/zzz_generated/app-common/clusters/GroupKeyManagement/Commands.ipp
index 22b9430e5ab55b..793c273c0cdc57 100644
--- a/zzz_generated/app-common/clusters/GroupKeyManagement/Commands.ipp
+++ b/zzz_generated/app-common/clusters/GroupKeyManagement/Commands.ipp
@@ -87,7 +87,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace KeySetRead.
 namespace KeySetReadResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kGroupKeySet), groupKeySet);
@@ -165,7 +165,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace KeySetReadAllIndices.
 namespace KeySetReadAllIndicesResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kGroupKeySetIDs), groupKeySetIDs);
diff --git a/zzz_generated/app-common/clusters/Groups/Commands.h b/zzz_generated/app-common/clusters/Groups/Commands.h
index 9335a1906c8c18..58823ecd27268e 100644
--- a/zzz_generated/app-common/clusters/Groups/Commands.h
+++ b/zzz_generated/app-common/clusters/Groups/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -155,7 +156,7 @@ struct Type
     uint8_t status        = static_cast<uint8_t>(0);
     chip::GroupId groupID = static_cast<chip::GroupId>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -230,7 +231,7 @@ struct Type
     chip::GroupId groupID = static_cast<chip::GroupId>(0);
     chip::CharSpan groupName;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -304,7 +305,7 @@ struct Type
     DataModel::Nullable<uint8_t> capacity;
     DataModel::List<const chip::GroupId> groupList;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -377,7 +378,7 @@ struct Type
     uint8_t status        = static_cast<uint8_t>(0);
     chip::GroupId groupID = static_cast<chip::GroupId>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/Groups/Commands.ipp b/zzz_generated/app-common/clusters/Groups/Commands.ipp
index 8bb718ada5533e..9bc33b644b922d 100644
--- a/zzz_generated/app-common/clusters/Groups/Commands.ipp
+++ b/zzz_generated/app-common/clusters/Groups/Commands.ipp
@@ -64,7 +64,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace AddGroup.
 namespace AddGroupResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
@@ -125,7 +125,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace ViewGroup.
 namespace ViewGroupResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
@@ -191,7 +191,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace GetGroupMembership.
 namespace GetGroupMembershipResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kCapacity), capacity);
@@ -252,7 +252,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace RemoveGroup.
 namespace RemoveGroupResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/HepaFilterMonitoring/Commands.h b/zzz_generated/app-common/clusters/HepaFilterMonitoring/Commands.h
index 93f4d5f95d71c2..56ea019a8600c9 100644
--- a/zzz_generated/app-common/clusters/HepaFilterMonitoring/Commands.h
+++ b/zzz_generated/app-common/clusters/HepaFilterMonitoring/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/IcdManagement/Commands.h b/zzz_generated/app-common/clusters/IcdManagement/Commands.h
index 5e3b7d505c8f99..63d2e37ea81723 100644
--- a/zzz_generated/app-common/clusters/IcdManagement/Commands.h
+++ b/zzz_generated/app-common/clusters/IcdManagement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -137,7 +138,7 @@ struct Type
 
     uint32_t ICDCounter = static_cast<uint32_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -245,7 +246,7 @@ struct Type
 
     uint32_t promisedActiveDuration = static_cast<uint32_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/IcdManagement/Commands.ipp b/zzz_generated/app-common/clusters/IcdManagement/Commands.ipp
index 60a960bf33d3be..3a40dc111765e8 100644
--- a/zzz_generated/app-common/clusters/IcdManagement/Commands.ipp
+++ b/zzz_generated/app-common/clusters/IcdManagement/Commands.ipp
@@ -79,7 +79,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace RegisterClient.
 namespace RegisterClientResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kICDCounter), ICDCounter);
@@ -168,7 +168,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace StayActiveRequest.
 namespace StayActiveResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kPromisedActiveDuration), promisedActiveDuration);
diff --git a/zzz_generated/app-common/clusters/Identify/Commands.h b/zzz_generated/app-common/clusters/Identify/Commands.h
index 2cbb568d4637f9..aea3dd89277432 100644
--- a/zzz_generated/app-common/clusters/Identify/Commands.h
+++ b/zzz_generated/app-common/clusters/Identify/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/IlluminanceMeasurement/Commands.h b/zzz_generated/app-common/clusters/IlluminanceMeasurement/Commands.h
index a3904768f675d5..8257b0f33453dd 100644
--- a/zzz_generated/app-common/clusters/IlluminanceMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/IlluminanceMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/JointFabricAdministrator/Commands.h b/zzz_generated/app-common/clusters/JointFabricAdministrator/Commands.h
index 0092bac9c9cbb4..650720a7b1bc2e 100644
--- a/zzz_generated/app-common/clusters/JointFabricAdministrator/Commands.h
+++ b/zzz_generated/app-common/clusters/JointFabricAdministrator/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -140,7 +141,7 @@ struct Type
 
     chip::ByteSpan icaccsr;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -210,7 +211,7 @@ struct Type
 
     ICACResponseStatusEnum statusCode = static_cast<ICACResponseStatusEnum>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -322,7 +323,7 @@ struct Type
 
     TransferAnchorResponseStatusEnum statusCode = static_cast<TransferAnchorResponseStatusEnum>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/JointFabricAdministrator/Commands.ipp b/zzz_generated/app-common/clusters/JointFabricAdministrator/Commands.ipp
index 05f43df767cefd..4eb29663144c30 100644
--- a/zzz_generated/app-common/clusters/JointFabricAdministrator/Commands.ipp
+++ b/zzz_generated/app-common/clusters/JointFabricAdministrator/Commands.ipp
@@ -53,7 +53,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ICACCSRRequest.
 namespace ICACCSRResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kIcaccsr), icaccsr);
@@ -109,7 +109,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace AddICAC.
 namespace ICACResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatusCode), statusCode);
@@ -207,7 +207,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TransferAnchorRequest.
 namespace TransferAnchorResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatusCode), statusCode);
diff --git a/zzz_generated/app-common/clusters/JointFabricDatastore/Commands.h b/zzz_generated/app-common/clusters/JointFabricDatastore/Commands.h
index ba165df61d07bf..7fd2908f6a6044 100644
--- a/zzz_generated/app-common/clusters/JointFabricDatastore/Commands.h
+++ b/zzz_generated/app-common/clusters/JointFabricDatastore/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/KeypadInput/Commands.h b/zzz_generated/app-common/clusters/KeypadInput/Commands.h
index c79e86974dd5ec..9d0dc2e6d19124 100644
--- a/zzz_generated/app-common/clusters/KeypadInput/Commands.h
+++ b/zzz_generated/app-common/clusters/KeypadInput/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -110,7 +111,7 @@ struct Type
 
     StatusEnum status = static_cast<StatusEnum>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/KeypadInput/Commands.ipp b/zzz_generated/app-common/clusters/KeypadInput/Commands.ipp
index 047b10969a25f8..8e5deb12d1c0f5 100644
--- a/zzz_generated/app-common/clusters/KeypadInput/Commands.ipp
+++ b/zzz_generated/app-common/clusters/KeypadInput/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace SendKey.
 namespace SendKeyResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/LaundryDryerControls/Commands.h b/zzz_generated/app-common/clusters/LaundryDryerControls/Commands.h
index db892d80d66cfe..78affa8f668184 100644
--- a/zzz_generated/app-common/clusters/LaundryDryerControls/Commands.h
+++ b/zzz_generated/app-common/clusters/LaundryDryerControls/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/LaundryWasherControls/Commands.h b/zzz_generated/app-common/clusters/LaundryWasherControls/Commands.h
index a3b308c9907514..f4ec89aa82cb38 100644
--- a/zzz_generated/app-common/clusters/LaundryWasherControls/Commands.h
+++ b/zzz_generated/app-common/clusters/LaundryWasherControls/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/LaundryWasherMode/Commands.h b/zzz_generated/app-common/clusters/LaundryWasherMode/Commands.h
index 5ff1fb75c2fc65..6e751462053e29 100644
--- a/zzz_generated/app-common/clusters/LaundryWasherMode/Commands.h
+++ b/zzz_generated/app-common/clusters/LaundryWasherMode/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -112,7 +113,7 @@ struct Type
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/LaundryWasherMode/Commands.ipp b/zzz_generated/app-common/clusters/LaundryWasherMode/Commands.ipp
index 20cec86975559a..70958bc27e1dff 100644
--- a/zzz_generated/app-common/clusters/LaundryWasherMode/Commands.ipp
+++ b/zzz_generated/app-common/clusters/LaundryWasherMode/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ChangeToMode.
 namespace ChangeToModeResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/LevelControl/Commands.h b/zzz_generated/app-common/clusters/LevelControl/Commands.h
index 8bb582c17afb23..5252717694d3bc 100644
--- a/zzz_generated/app-common/clusters/LevelControl/Commands.h
+++ b/zzz_generated/app-common/clusters/LevelControl/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/LocalizationConfiguration/Commands.h b/zzz_generated/app-common/clusters/LocalizationConfiguration/Commands.h
index 40c914553b373c..33e23c31209b92 100644
--- a/zzz_generated/app-common/clusters/LocalizationConfiguration/Commands.h
+++ b/zzz_generated/app-common/clusters/LocalizationConfiguration/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/LowPower/Commands.h b/zzz_generated/app-common/clusters/LowPower/Commands.h
index d9e8ced73bdfeb..c727a8e18860a7 100644
--- a/zzz_generated/app-common/clusters/LowPower/Commands.h
+++ b/zzz_generated/app-common/clusters/LowPower/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/MediaInput/Commands.h b/zzz_generated/app-common/clusters/MediaInput/Commands.h
index 5b1af442cbb7ad..c76395af0c3589 100644
--- a/zzz_generated/app-common/clusters/MediaInput/Commands.h
+++ b/zzz_generated/app-common/clusters/MediaInput/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/MediaPlayback/Commands.h b/zzz_generated/app-common/clusters/MediaPlayback/Commands.h
index da17ff26d322ed..95b809cf64fcb3 100644
--- a/zzz_generated/app-common/clusters/MediaPlayback/Commands.h
+++ b/zzz_generated/app-common/clusters/MediaPlayback/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -462,7 +463,7 @@ struct Type
     StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::CharSpan> data;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/MediaPlayback/Commands.ipp b/zzz_generated/app-common/clusters/MediaPlayback/Commands.ipp
index 95693e10f9d428..7f6bb1dba3542f 100644
--- a/zzz_generated/app-common/clusters/MediaPlayback/Commands.ipp
+++ b/zzz_generated/app-common/clusters/MediaPlayback/Commands.ipp
@@ -275,7 +275,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace SkipBackward.
 namespace PlaybackResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/Messages/Commands.h b/zzz_generated/app-common/clusters/Messages/Commands.h
index f4601c63ca6e77..1fdd106259e241 100644
--- a/zzz_generated/app-common/clusters/Messages/Commands.h
+++ b/zzz_generated/app-common/clusters/Messages/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/MeterIdentification/Commands.h b/zzz_generated/app-common/clusters/MeterIdentification/Commands.h
index 7b64f50933cfbb..e2434366a51441 100644
--- a/zzz_generated/app-common/clusters/MeterIdentification/Commands.h
+++ b/zzz_generated/app-common/clusters/MeterIdentification/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/MicrowaveOvenControl/Commands.h b/zzz_generated/app-common/clusters/MicrowaveOvenControl/Commands.h
index 2264406e94f125..1249769992b231 100644
--- a/zzz_generated/app-common/clusters/MicrowaveOvenControl/Commands.h
+++ b/zzz_generated/app-common/clusters/MicrowaveOvenControl/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/MicrowaveOvenMode/Commands.h b/zzz_generated/app-common/clusters/MicrowaveOvenMode/Commands.h
index eae833374498bb..9c46bc1e93df4e 100644
--- a/zzz_generated/app-common/clusters/MicrowaveOvenMode/Commands.h
+++ b/zzz_generated/app-common/clusters/MicrowaveOvenMode/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ModeSelect/Commands.h b/zzz_generated/app-common/clusters/ModeSelect/Commands.h
index 8d5d0702391a3a..1bba5014db24f9 100644
--- a/zzz_generated/app-common/clusters/ModeSelect/Commands.h
+++ b/zzz_generated/app-common/clusters/ModeSelect/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/NetworkCommissioning/Commands.h b/zzz_generated/app-common/clusters/NetworkCommissioning/Commands.h
index f2714215e7ac0e..209e3e139eadb0 100644
--- a/zzz_generated/app-common/clusters/NetworkCommissioning/Commands.h
+++ b/zzz_generated/app-common/clusters/NetworkCommissioning/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -164,7 +165,7 @@ struct Type
     Optional<DataModel::List<const Structs::WiFiInterfaceScanResultStruct::Type>> wiFiScanResults;
     Optional<DataModel::List<const Structs::ThreadInterfaceScanResultStruct::Type>> threadScanResults;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -336,7 +337,7 @@ struct Type
     Optional<chip::ByteSpan> clientIdentity;
     Optional<chip::ByteSpan> possessionSignature;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -417,7 +418,7 @@ struct Type
     Optional<chip::CharSpan> debugText;
     DataModel::Nullable<int32_t> errorValue;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -535,7 +536,7 @@ struct Type
     chip::ByteSpan identity;
     Optional<chip::ByteSpan> possessionSignature;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/NetworkCommissioning/Commands.ipp b/zzz_generated/app-common/clusters/NetworkCommissioning/Commands.ipp
index 55376130ad46ae..d8a7390b6ac761 100644
--- a/zzz_generated/app-common/clusters/NetworkCommissioning/Commands.ipp
+++ b/zzz_generated/app-common/clusters/NetworkCommissioning/Commands.ipp
@@ -64,7 +64,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ScanNetworks.
 namespace ScanNetworksResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kNetworkingStatus), networkingStatus);
@@ -226,7 +226,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace RemoveNetwork.
 namespace NetworkConfigResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kNetworkingStatus), networkingStatus);
@@ -307,7 +307,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ConnectNetwork.
 namespace ConnectNetworkResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kNetworkingStatus), networkingStatus);
@@ -416,7 +416,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace QueryIdentity.
 namespace QueryIdentityResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kIdentity), identity);
diff --git a/zzz_generated/app-common/clusters/NitrogenDioxideConcentrationMeasurement/Commands.h b/zzz_generated/app-common/clusters/NitrogenDioxideConcentrationMeasurement/Commands.h
index 8c737ce0df5357..e203e20057775a 100644
--- a/zzz_generated/app-common/clusters/NitrogenDioxideConcentrationMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/NitrogenDioxideConcentrationMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/OccupancySensing/Commands.h b/zzz_generated/app-common/clusters/OccupancySensing/Commands.h
index a3fc7b8c305406..b9ff2aab59af7d 100644
--- a/zzz_generated/app-common/clusters/OccupancySensing/Commands.h
+++ b/zzz_generated/app-common/clusters/OccupancySensing/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/OnOff/Commands.h b/zzz_generated/app-common/clusters/OnOff/Commands.h
index d675c556e2a550..ef9c7e51dfae70 100644
--- a/zzz_generated/app-common/clusters/OnOff/Commands.h
+++ b/zzz_generated/app-common/clusters/OnOff/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/OperationalCredentials/Commands.h b/zzz_generated/app-common/clusters/OperationalCredentials/Commands.h
index 8e959e07fe7975..4ade79906846a3 100644
--- a/zzz_generated/app-common/clusters/OperationalCredentials/Commands.h
+++ b/zzz_generated/app-common/clusters/OperationalCredentials/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -177,7 +178,7 @@ struct Type
     chip::ByteSpan attestationElements;
     chip::ByteSpan attestationSignature;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -248,7 +249,7 @@ struct Type
 
     chip::ByteSpan certificate;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -323,7 +324,7 @@ struct Type
     chip::ByteSpan NOCSRElements;
     chip::ByteSpan attestationSignature;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -448,7 +449,7 @@ struct Type
     Optional<chip::FabricIndex> fabricIndex;
     Optional<chip::CharSpan> debugText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -673,7 +674,7 @@ struct Type
     uint8_t fabricBindingVersion  = static_cast<uint8_t>(0);
     chip::ByteSpan signature;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/OperationalCredentials/Commands.ipp b/zzz_generated/app-common/clusters/OperationalCredentials/Commands.ipp
index 88ecd9abc4cde0..e7fa388ca86a7d 100644
--- a/zzz_generated/app-common/clusters/OperationalCredentials/Commands.ipp
+++ b/zzz_generated/app-common/clusters/OperationalCredentials/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace AttestationRequest.
 namespace AttestationResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kAttestationElements), attestationElements);
@@ -120,7 +120,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace CertificateChainRequest.
 namespace CertificateChainResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kCertificate), certificate);
@@ -181,7 +181,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace CSRRequest.
 namespace CSRResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kNOCSRElements), NOCSRElements);
@@ -295,7 +295,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace UpdateNOC.
 namespace NOCResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatusCode), statusCode);
@@ -488,7 +488,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace SignVIDVerificationRequest.
 namespace SignVIDVerificationResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kFabricIndex), fabricIndex);
diff --git a/zzz_generated/app-common/clusters/OperationalState/Commands.h b/zzz_generated/app-common/clusters/OperationalState/Commands.h
index 7dad92babd1eea..86b7ad3d8f6b56 100644
--- a/zzz_generated/app-common/clusters/OperationalState/Commands.h
+++ b/zzz_generated/app-common/clusters/OperationalState/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -210,7 +211,7 @@ struct Type
 
     Structs::ErrorStateStruct::Type commandResponseState;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/OperationalState/Commands.ipp b/zzz_generated/app-common/clusters/OperationalState/Commands.ipp
index 6d68cf1ffcc2d7..ff4d32de7776d6 100644
--- a/zzz_generated/app-common/clusters/OperationalState/Commands.ipp
+++ b/zzz_generated/app-common/clusters/OperationalState/Commands.ipp
@@ -119,7 +119,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace Resume.
 namespace OperationalCommandResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kCommandResponseState), commandResponseState);
diff --git a/zzz_generated/app-common/clusters/OtaSoftwareUpdateProvider/Commands.h b/zzz_generated/app-common/clusters/OtaSoftwareUpdateProvider/Commands.h
index abb71eff0f321a..f96c4138b1ffa0 100644
--- a/zzz_generated/app-common/clusters/OtaSoftwareUpdateProvider/Commands.h
+++ b/zzz_generated/app-common/clusters/OtaSoftwareUpdateProvider/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -160,7 +161,7 @@ struct Type
     Optional<bool> userConsentNeeded;
     Optional<chip::ByteSpan> metadataForRequestor;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -242,7 +243,7 @@ struct Type
     ApplyUpdateActionEnum action = static_cast<ApplyUpdateActionEnum>(0);
     uint32_t delayedActionTime   = static_cast<uint32_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/OtaSoftwareUpdateProvider/Commands.ipp b/zzz_generated/app-common/clusters/OtaSoftwareUpdateProvider/Commands.ipp
index 9c5f6414420964..eb68db0afa2756 100644
--- a/zzz_generated/app-common/clusters/OtaSoftwareUpdateProvider/Commands.ipp
+++ b/zzz_generated/app-common/clusters/OtaSoftwareUpdateProvider/Commands.ipp
@@ -94,7 +94,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace QueryImage.
 namespace QueryImageResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
@@ -190,7 +190,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ApplyUpdateRequest.
 namespace ApplyUpdateResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kAction), action);
diff --git a/zzz_generated/app-common/clusters/OtaSoftwareUpdateRequestor/Commands.h b/zzz_generated/app-common/clusters/OtaSoftwareUpdateRequestor/Commands.h
index 2b759acac7215c..0d853e9bccb8c0 100644
--- a/zzz_generated/app-common/clusters/OtaSoftwareUpdateRequestor/Commands.h
+++ b/zzz_generated/app-common/clusters/OtaSoftwareUpdateRequestor/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/OvenCavityOperationalState/Commands.h b/zzz_generated/app-common/clusters/OvenCavityOperationalState/Commands.h
index 9b512e04a977ce..6f3521d2e66498 100644
--- a/zzz_generated/app-common/clusters/OvenCavityOperationalState/Commands.h
+++ b/zzz_generated/app-common/clusters/OvenCavityOperationalState/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -140,7 +141,7 @@ struct Type
 
     Structs::ErrorStateStruct::Type commandResponseState;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/OvenCavityOperationalState/Commands.ipp b/zzz_generated/app-common/clusters/OvenCavityOperationalState/Commands.ipp
index f82ed4f2f0d579..bea009b9b682df 100644
--- a/zzz_generated/app-common/clusters/OvenCavityOperationalState/Commands.ipp
+++ b/zzz_generated/app-common/clusters/OvenCavityOperationalState/Commands.ipp
@@ -75,7 +75,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace Start.
 namespace OperationalCommandResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kCommandResponseState), commandResponseState);
diff --git a/zzz_generated/app-common/clusters/OvenMode/Commands.h b/zzz_generated/app-common/clusters/OvenMode/Commands.h
index aaef09c977802f..09e39fd97c67ab 100644
--- a/zzz_generated/app-common/clusters/OvenMode/Commands.h
+++ b/zzz_generated/app-common/clusters/OvenMode/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -112,7 +113,7 @@ struct Type
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/OvenMode/Commands.ipp b/zzz_generated/app-common/clusters/OvenMode/Commands.ipp
index 000acfd6c68bc0..913164f95e1a99 100644
--- a/zzz_generated/app-common/clusters/OvenMode/Commands.ipp
+++ b/zzz_generated/app-common/clusters/OvenMode/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ChangeToMode.
 namespace ChangeToModeResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/OzoneConcentrationMeasurement/Commands.h b/zzz_generated/app-common/clusters/OzoneConcentrationMeasurement/Commands.h
index b06721f3342c0a..04538a0dd0d9d9 100644
--- a/zzz_generated/app-common/clusters/OzoneConcentrationMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/OzoneConcentrationMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/Pm10ConcentrationMeasurement/Commands.h b/zzz_generated/app-common/clusters/Pm10ConcentrationMeasurement/Commands.h
index cfd0f4bf80ae19..614c6d610d6d80 100644
--- a/zzz_generated/app-common/clusters/Pm10ConcentrationMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/Pm10ConcentrationMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/Pm1ConcentrationMeasurement/Commands.h b/zzz_generated/app-common/clusters/Pm1ConcentrationMeasurement/Commands.h
index 3e953f18652a79..48150a315e85b8 100644
--- a/zzz_generated/app-common/clusters/Pm1ConcentrationMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/Pm1ConcentrationMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/Pm25ConcentrationMeasurement/Commands.h b/zzz_generated/app-common/clusters/Pm25ConcentrationMeasurement/Commands.h
index a7c16994ff3ce6..2d676dd0cfa165 100644
--- a/zzz_generated/app-common/clusters/Pm25ConcentrationMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/Pm25ConcentrationMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/PowerSource/Commands.h b/zzz_generated/app-common/clusters/PowerSource/Commands.h
index 6ccad1abca2f24..965e172be53a4e 100644
--- a/zzz_generated/app-common/clusters/PowerSource/Commands.h
+++ b/zzz_generated/app-common/clusters/PowerSource/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/PowerSourceConfiguration/Commands.h b/zzz_generated/app-common/clusters/PowerSourceConfiguration/Commands.h
index 15c2a23aadf7a5..bd7fd18f28714f 100644
--- a/zzz_generated/app-common/clusters/PowerSourceConfiguration/Commands.h
+++ b/zzz_generated/app-common/clusters/PowerSourceConfiguration/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/PowerTopology/Commands.h b/zzz_generated/app-common/clusters/PowerTopology/Commands.h
index c3ddee27a16e40..306020240c1b87 100644
--- a/zzz_generated/app-common/clusters/PowerTopology/Commands.h
+++ b/zzz_generated/app-common/clusters/PowerTopology/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/PressureMeasurement/Commands.h b/zzz_generated/app-common/clusters/PressureMeasurement/Commands.h
index 261cdd163c19c9..41b200da1a1bab 100644
--- a/zzz_generated/app-common/clusters/PressureMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/PressureMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ProxyConfiguration/Commands.h b/zzz_generated/app-common/clusters/ProxyConfiguration/Commands.h
index 4f303ba8a97afe..9a9de2efa189a3 100644
--- a/zzz_generated/app-common/clusters/ProxyConfiguration/Commands.h
+++ b/zzz_generated/app-common/clusters/ProxyConfiguration/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ProxyDiscovery/Commands.h b/zzz_generated/app-common/clusters/ProxyDiscovery/Commands.h
index cfb82154981880..1e29d759c0a815 100644
--- a/zzz_generated/app-common/clusters/ProxyDiscovery/Commands.h
+++ b/zzz_generated/app-common/clusters/ProxyDiscovery/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ProxyValid/Commands.h b/zzz_generated/app-common/clusters/ProxyValid/Commands.h
index 0a2f6d063df78e..26c4e5515b3f6f 100644
--- a/zzz_generated/app-common/clusters/ProxyValid/Commands.h
+++ b/zzz_generated/app-common/clusters/ProxyValid/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/PulseWidthModulation/Commands.h b/zzz_generated/app-common/clusters/PulseWidthModulation/Commands.h
index 563cb3034c7f3c..e5d929d664a2bc 100644
--- a/zzz_generated/app-common/clusters/PulseWidthModulation/Commands.h
+++ b/zzz_generated/app-common/clusters/PulseWidthModulation/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/PumpConfigurationAndControl/Commands.h b/zzz_generated/app-common/clusters/PumpConfigurationAndControl/Commands.h
index 4dd9ae0fb5dec0..8ebe03ef0afbed 100644
--- a/zzz_generated/app-common/clusters/PumpConfigurationAndControl/Commands.h
+++ b/zzz_generated/app-common/clusters/PumpConfigurationAndControl/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/PushAvStreamTransport/Commands.h b/zzz_generated/app-common/clusters/PushAvStreamTransport/Commands.h
index 3b739dd9a28587..83574b49f611c1 100644
--- a/zzz_generated/app-common/clusters/PushAvStreamTransport/Commands.h
+++ b/zzz_generated/app-common/clusters/PushAvStreamTransport/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -140,7 +141,7 @@ struct Type
 
     Structs::TransportConfigurationStruct::Type transportConfiguration;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -362,7 +363,7 @@ struct Type
 
     DataModel::List<const Structs::TransportConfigurationStruct::Type> transportConfigurations;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/PushAvStreamTransport/Commands.ipp b/zzz_generated/app-common/clusters/PushAvStreamTransport/Commands.ipp
index 9640045fef318f..f62d438ec085cd 100644
--- a/zzz_generated/app-common/clusters/PushAvStreamTransport/Commands.ipp
+++ b/zzz_generated/app-common/clusters/PushAvStreamTransport/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace AllocatePushTransport.
 namespace AllocatePushTransportResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kTransportConfiguration), transportConfiguration);
@@ -247,7 +247,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace FindTransport.
 namespace FindTransportResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kTransportConfigurations), transportConfigurations);
diff --git a/zzz_generated/app-common/clusters/RadonConcentrationMeasurement/Commands.h b/zzz_generated/app-common/clusters/RadonConcentrationMeasurement/Commands.h
index 444b44c7404c91..39175ffbeaae15 100644
--- a/zzz_generated/app-common/clusters/RadonConcentrationMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/RadonConcentrationMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/RefrigeratorAlarm/Commands.h b/zzz_generated/app-common/clusters/RefrigeratorAlarm/Commands.h
index bf2bdafa8883e3..749529ff1509a2 100644
--- a/zzz_generated/app-common/clusters/RefrigeratorAlarm/Commands.h
+++ b/zzz_generated/app-common/clusters/RefrigeratorAlarm/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/RefrigeratorAndTemperatureControlledCabinetMode/Commands.h b/zzz_generated/app-common/clusters/RefrigeratorAndTemperatureControlledCabinetMode/Commands.h
index 80a469ec247d55..8ebeb537021a65 100644
--- a/zzz_generated/app-common/clusters/RefrigeratorAndTemperatureControlledCabinetMode/Commands.h
+++ b/zzz_generated/app-common/clusters/RefrigeratorAndTemperatureControlledCabinetMode/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -112,7 +113,7 @@ struct Type
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/RefrigeratorAndTemperatureControlledCabinetMode/Commands.ipp b/zzz_generated/app-common/clusters/RefrigeratorAndTemperatureControlledCabinetMode/Commands.ipp
index de9bf5695a9d41..fac2ed559c6df8 100644
--- a/zzz_generated/app-common/clusters/RefrigeratorAndTemperatureControlledCabinetMode/Commands.ipp
+++ b/zzz_generated/app-common/clusters/RefrigeratorAndTemperatureControlledCabinetMode/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ChangeToMode.
 namespace ChangeToModeResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/RelativeHumidityMeasurement/Commands.h b/zzz_generated/app-common/clusters/RelativeHumidityMeasurement/Commands.h
index 6c4508437debc4..53ae23043d590d 100644
--- a/zzz_generated/app-common/clusters/RelativeHumidityMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/RelativeHumidityMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/RvcCleanMode/Commands.h b/zzz_generated/app-common/clusters/RvcCleanMode/Commands.h
index 705a1abf7332f6..61ffc03286f88e 100644
--- a/zzz_generated/app-common/clusters/RvcCleanMode/Commands.h
+++ b/zzz_generated/app-common/clusters/RvcCleanMode/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -112,7 +113,7 @@ struct Type
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/RvcCleanMode/Commands.ipp b/zzz_generated/app-common/clusters/RvcCleanMode/Commands.ipp
index a79e96d084c468..eb048e6ea539d4 100644
--- a/zzz_generated/app-common/clusters/RvcCleanMode/Commands.ipp
+++ b/zzz_generated/app-common/clusters/RvcCleanMode/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ChangeToMode.
 namespace ChangeToModeResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/RvcOperationalState/Commands.h b/zzz_generated/app-common/clusters/RvcOperationalState/Commands.h
index b83fe693483d20..e0f12a6b031073 100644
--- a/zzz_generated/app-common/clusters/RvcOperationalState/Commands.h
+++ b/zzz_generated/app-common/clusters/RvcOperationalState/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -145,7 +146,7 @@ struct Type
 
     Structs::ErrorStateStruct::Type commandResponseState;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/RvcOperationalState/Commands.ipp b/zzz_generated/app-common/clusters/RvcOperationalState/Commands.ipp
index d2a3177e29d392..3cbb543a28113c 100644
--- a/zzz_generated/app-common/clusters/RvcOperationalState/Commands.ipp
+++ b/zzz_generated/app-common/clusters/RvcOperationalState/Commands.ipp
@@ -75,7 +75,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace Resume.
 namespace OperationalCommandResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kCommandResponseState), commandResponseState);
diff --git a/zzz_generated/app-common/clusters/RvcRunMode/Commands.h b/zzz_generated/app-common/clusters/RvcRunMode/Commands.h
index 7f26a4994d7da7..19f1954a1cf622 100644
--- a/zzz_generated/app-common/clusters/RvcRunMode/Commands.h
+++ b/zzz_generated/app-common/clusters/RvcRunMode/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -112,7 +113,7 @@ struct Type
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/RvcRunMode/Commands.ipp b/zzz_generated/app-common/clusters/RvcRunMode/Commands.ipp
index b7d56d5448085b..6d30b91f05c888 100644
--- a/zzz_generated/app-common/clusters/RvcRunMode/Commands.ipp
+++ b/zzz_generated/app-common/clusters/RvcRunMode/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ChangeToMode.
 namespace ChangeToModeResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/SampleMei/Commands.h b/zzz_generated/app-common/clusters/SampleMei/Commands.h
index d34c3c76379a1e..e9ef4a259f9657 100644
--- a/zzz_generated/app-common/clusters/SampleMei/Commands.h
+++ b/zzz_generated/app-common/clusters/SampleMei/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -110,7 +111,7 @@ struct Type
 
     uint8_t returnValue = static_cast<uint8_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/SampleMei/Commands.ipp b/zzz_generated/app-common/clusters/SampleMei/Commands.ipp
index f5f4134987de95..d71b6ed3232438 100644
--- a/zzz_generated/app-common/clusters/SampleMei/Commands.ipp
+++ b/zzz_generated/app-common/clusters/SampleMei/Commands.ipp
@@ -53,7 +53,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace Ping.
 namespace AddArgumentsResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kReturnValue), returnValue);
diff --git a/zzz_generated/app-common/clusters/ScenesManagement/Commands.h b/zzz_generated/app-common/clusters/ScenesManagement/Commands.h
index ce6a3901f9dc1e..60a24fe75d887d 100644
--- a/zzz_generated/app-common/clusters/ScenesManagement/Commands.h
+++ b/zzz_generated/app-common/clusters/ScenesManagement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -191,7 +192,7 @@ struct Type
     chip::GroupId groupID = static_cast<chip::GroupId>(0);
     uint8_t sceneID       = static_cast<uint8_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -276,7 +277,7 @@ struct Type
     Optional<chip::CharSpan> sceneName;
     Optional<DataModel::List<const Structs::ExtensionFieldSetStruct::Type>> extensionFieldSetStructs;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -358,7 +359,7 @@ struct Type
     chip::GroupId groupID = static_cast<chip::GroupId>(0);
     uint8_t sceneID       = static_cast<uint8_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -432,7 +433,7 @@ struct Type
     uint8_t status        = static_cast<uint8_t>(0);
     chip::GroupId groupID = static_cast<chip::GroupId>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -510,7 +511,7 @@ struct Type
     chip::GroupId groupID = static_cast<chip::GroupId>(0);
     uint8_t sceneID       = static_cast<uint8_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -629,7 +630,7 @@ struct Type
     chip::GroupId groupID = static_cast<chip::GroupId>(0);
     Optional<DataModel::List<const uint8_t>> sceneList;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -718,7 +719,7 @@ struct Type
     chip::GroupId groupIdentifierFrom = static_cast<chip::GroupId>(0);
     uint8_t sceneIdentifierFrom       = static_cast<uint8_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/ScenesManagement/Commands.ipp b/zzz_generated/app-common/clusters/ScenesManagement/Commands.ipp
index 1f5253229f966a..5f3b61b12579ab 100644
--- a/zzz_generated/app-common/clusters/ScenesManagement/Commands.ipp
+++ b/zzz_generated/app-common/clusters/ScenesManagement/Commands.ipp
@@ -79,7 +79,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace AddScene.
 namespace AddSceneResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
@@ -150,7 +150,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace ViewScene.
 namespace ViewSceneResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
@@ -236,7 +236,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace RemoveScene.
 namespace RemoveSceneResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
@@ -302,7 +302,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace RemoveAllScenes.
 namespace RemoveAllScenesResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
@@ -368,7 +368,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace StoreScene.
 namespace StoreSceneResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
@@ -472,7 +472,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace GetSceneMembership.
 namespace GetSceneMembershipResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
@@ -563,7 +563,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace CopyScene.
 namespace CopySceneResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/ServiceArea/Commands.h b/zzz_generated/app-common/clusters/ServiceArea/Commands.h
index a6b370348abb36..3913fbe0b1fe53 100644
--- a/zzz_generated/app-common/clusters/ServiceArea/Commands.h
+++ b/zzz_generated/app-common/clusters/ServiceArea/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -122,7 +123,7 @@ struct Type
     SelectAreasStatus status = static_cast<SelectAreasStatus>(0);
     chip::CharSpan statusText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -195,7 +196,7 @@ struct Type
     SkipAreaStatus status = static_cast<SkipAreaStatus>(0);
     chip::CharSpan statusText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/ServiceArea/Commands.ipp b/zzz_generated/app-common/clusters/ServiceArea/Commands.ipp
index 0eceda56f580f1..8b78f08d9d6ba7 100644
--- a/zzz_generated/app-common/clusters/ServiceArea/Commands.ipp
+++ b/zzz_generated/app-common/clusters/ServiceArea/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace SelectAreas.
 namespace SelectAreasResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
@@ -120,7 +120,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace SkipArea.
 namespace SkipAreaResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/SmokeCoAlarm/Commands.h b/zzz_generated/app-common/clusters/SmokeCoAlarm/Commands.h
index fdd5b26c844254..6153e4ff0001d0 100644
--- a/zzz_generated/app-common/clusters/SmokeCoAlarm/Commands.h
+++ b/zzz_generated/app-common/clusters/SmokeCoAlarm/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/SoftwareDiagnostics/Commands.h b/zzz_generated/app-common/clusters/SoftwareDiagnostics/Commands.h
index 69e17b4cffa9aa..732949dc737615 100644
--- a/zzz_generated/app-common/clusters/SoftwareDiagnostics/Commands.h
+++ b/zzz_generated/app-common/clusters/SoftwareDiagnostics/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/SoilMeasurement/Commands.h b/zzz_generated/app-common/clusters/SoilMeasurement/Commands.h
index 8a14dae5e09380..c93c0526bd9133 100644
--- a/zzz_generated/app-common/clusters/SoilMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/SoilMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/Switch/Commands.h b/zzz_generated/app-common/clusters/Switch/Commands.h
index 7ddcb5de13ae72..ae8e414ad2ccf8 100644
--- a/zzz_generated/app-common/clusters/Switch/Commands.h
+++ b/zzz_generated/app-common/clusters/Switch/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/TargetNavigator/Commands.h b/zzz_generated/app-common/clusters/TargetNavigator/Commands.h
index f61c3062d0c134..7d4478c10625d8 100644
--- a/zzz_generated/app-common/clusters/TargetNavigator/Commands.h
+++ b/zzz_generated/app-common/clusters/TargetNavigator/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -115,7 +116,7 @@ struct Type
     StatusEnum status = static_cast<StatusEnum>(0);
     Optional<chip::CharSpan> data;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/TargetNavigator/Commands.ipp b/zzz_generated/app-common/clusters/TargetNavigator/Commands.ipp
index 5cfee73c018687..2849e9a4c4c2bc 100644
--- a/zzz_generated/app-common/clusters/TargetNavigator/Commands.ipp
+++ b/zzz_generated/app-common/clusters/TargetNavigator/Commands.ipp
@@ -64,7 +64,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace NavigateTarget.
 namespace NavigateTargetResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/TemperatureControl/Commands.h b/zzz_generated/app-common/clusters/TemperatureControl/Commands.h
index 0b4b0606d310d9..30aa944ced0006 100644
--- a/zzz_generated/app-common/clusters/TemperatureControl/Commands.h
+++ b/zzz_generated/app-common/clusters/TemperatureControl/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/TemperatureMeasurement/Commands.h b/zzz_generated/app-common/clusters/TemperatureMeasurement/Commands.h
index bf61a506e332b2..e2c4e29cde4aee 100644
--- a/zzz_generated/app-common/clusters/TemperatureMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/TemperatureMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/Thermostat/Commands.h b/zzz_generated/app-common/clusters/Thermostat/Commands.h
index 57451347496a30..d535426da24fa8 100644
--- a/zzz_generated/app-common/clusters/Thermostat/Commands.h
+++ b/zzz_generated/app-common/clusters/Thermostat/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -154,7 +155,7 @@ struct Type
     chip::BitMask<ScheduleModeBitmap> modeForSequence           = static_cast<chip::BitMask<ScheduleModeBitmap>>(0);
     DataModel::List<const Structs::WeeklyScheduleTransitionStruct::Type> transitions;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -378,7 +379,7 @@ struct Type
     DataModel::List<const Globals::Structs::AtomicAttributeStatusStruct::Type> attributeStatus;
     Optional<uint16_t> timeout;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/Thermostat/Commands.ipp b/zzz_generated/app-common/clusters/Thermostat/Commands.ipp
index 7181e6462fcaaa..e3dae965f342ff 100644
--- a/zzz_generated/app-common/clusters/Thermostat/Commands.ipp
+++ b/zzz_generated/app-common/clusters/Thermostat/Commands.ipp
@@ -64,7 +64,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace SetpointRaiseLower.
 namespace GetWeeklyScheduleResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kNumberOfTransitionsForSequence), numberOfTransitionsForSequence);
@@ -261,7 +261,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace SetActivePresetRequest.
 namespace AtomicResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatusCode), statusCode);
diff --git a/zzz_generated/app-common/clusters/ThermostatUserInterfaceConfiguration/Commands.h b/zzz_generated/app-common/clusters/ThermostatUserInterfaceConfiguration/Commands.h
index 3f260f97ff9194..0122b36a90381b 100644
--- a/zzz_generated/app-common/clusters/ThermostatUserInterfaceConfiguration/Commands.h
+++ b/zzz_generated/app-common/clusters/ThermostatUserInterfaceConfiguration/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ThreadBorderRouterManagement/Commands.h b/zzz_generated/app-common/clusters/ThreadBorderRouterManagement/Commands.h
index bf5c790b72d02e..3c7743c8e7d52f 100644
--- a/zzz_generated/app-common/clusters/ThreadBorderRouterManagement/Commands.h
+++ b/zzz_generated/app-common/clusters/ThreadBorderRouterManagement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -150,7 +151,7 @@ struct Type
 
     chip::ByteSpan dataset;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/ThreadBorderRouterManagement/Commands.ipp b/zzz_generated/app-common/clusters/ThreadBorderRouterManagement/Commands.ipp
index 7d254d621adadb..bcbaa7f548ecb1 100644
--- a/zzz_generated/app-common/clusters/ThreadBorderRouterManagement/Commands.ipp
+++ b/zzz_generated/app-common/clusters/ThreadBorderRouterManagement/Commands.ipp
@@ -75,7 +75,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace GetPendingDatasetRequest.
 namespace DatasetResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kDataset), dataset);
diff --git a/zzz_generated/app-common/clusters/ThreadNetworkDiagnostics/Commands.h b/zzz_generated/app-common/clusters/ThreadNetworkDiagnostics/Commands.h
index 8c6179a98ff482..dec376723c812c 100644
--- a/zzz_generated/app-common/clusters/ThreadNetworkDiagnostics/Commands.h
+++ b/zzz_generated/app-common/clusters/ThreadNetworkDiagnostics/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ThreadNetworkDirectory/Commands.h b/zzz_generated/app-common/clusters/ThreadNetworkDirectory/Commands.h
index f1350196213906..8d7ad6ccd931ee 100644
--- a/zzz_generated/app-common/clusters/ThreadNetworkDirectory/Commands.h
+++ b/zzz_generated/app-common/clusters/ThreadNetworkDirectory/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -190,7 +191,7 @@ struct Type
 
     chip::ByteSpan operationalDataset;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/ThreadNetworkDirectory/Commands.ipp b/zzz_generated/app-common/clusters/ThreadNetworkDirectory/Commands.ipp
index 5d0b2a0d81f1f6..56e719ead33abe 100644
--- a/zzz_generated/app-common/clusters/ThreadNetworkDirectory/Commands.ipp
+++ b/zzz_generated/app-common/clusters/ThreadNetworkDirectory/Commands.ipp
@@ -115,7 +115,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace GetOperationalDataset.
 namespace OperationalDatasetResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kOperationalDataset), operationalDataset);
diff --git a/zzz_generated/app-common/clusters/TimeFormatLocalization/Commands.h b/zzz_generated/app-common/clusters/TimeFormatLocalization/Commands.h
index 9bf700c3d1d5cc..2ff6b1716dac56 100644
--- a/zzz_generated/app-common/clusters/TimeFormatLocalization/Commands.h
+++ b/zzz_generated/app-common/clusters/TimeFormatLocalization/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/TimeSynchronization/Commands.h b/zzz_generated/app-common/clusters/TimeSynchronization/Commands.h
index 0872c77eb3b6b4..4e63bfc106acad 100644
--- a/zzz_generated/app-common/clusters/TimeSynchronization/Commands.h
+++ b/zzz_generated/app-common/clusters/TimeSynchronization/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -206,7 +207,7 @@ struct Type
 
     bool DSTOffsetRequired = static_cast<bool>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/TimeSynchronization/Commands.ipp b/zzz_generated/app-common/clusters/TimeSynchronization/Commands.ipp
index e5ea898366b2de..6beb1815706b4a 100644
--- a/zzz_generated/app-common/clusters/TimeSynchronization/Commands.ipp
+++ b/zzz_generated/app-common/clusters/TimeSynchronization/Commands.ipp
@@ -125,7 +125,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace SetTimeZone.
 namespace SetTimeZoneResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kDSTOffsetRequired), DSTOffsetRequired);
diff --git a/zzz_generated/app-common/clusters/Timer/Commands.h b/zzz_generated/app-common/clusters/Timer/Commands.h
index 37e6c4abc513d9..7ec0f9e7a15cea 100644
--- a/zzz_generated/app-common/clusters/Timer/Commands.h
+++ b/zzz_generated/app-common/clusters/Timer/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/TlsCertificateManagement/Commands.h b/zzz_generated/app-common/clusters/TlsCertificateManagement/Commands.h
index d09cad60587d6d..bb1e75e0b7c3c0 100644
--- a/zzz_generated/app-common/clusters/TlsCertificateManagement/Commands.h
+++ b/zzz_generated/app-common/clusters/TlsCertificateManagement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -178,7 +179,7 @@ struct Type
 
     uint16_t caid = static_cast<uint16_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -248,7 +249,7 @@ struct Type
 
     DataModel::List<const Structs::TLSCertStruct::Type> certificateDetails;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag, FabricIndex aAccessingFabricIndex) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -318,7 +319,7 @@ struct Type
 
     uint16_t caid = static_cast<uint16_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -427,7 +428,7 @@ struct Type
     chip::ByteSpan csr;
     chip::ByteSpan nonce;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -537,7 +538,7 @@ struct Type
 
     DataModel::List<const Structs::TLSClientCertificateDetailStruct::Type> certificateDetails;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag, FabricIndex aAccessingFabricIndex) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -607,7 +608,7 @@ struct Type
 
     uint16_t ccdid = static_cast<uint16_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/TlsCertificateManagement/Commands.ipp b/zzz_generated/app-common/clusters/TlsCertificateManagement/Commands.ipp
index a40f8a45d3e39b..0b6a2e1b19e549 100644
--- a/zzz_generated/app-common/clusters/TlsCertificateManagement/Commands.ipp
+++ b/zzz_generated/app-common/clusters/TlsCertificateManagement/Commands.ipp
@@ -64,7 +64,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace ProvisionRootCertificate.
 namespace ProvisionRootCertificateResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kCaid), caid);
@@ -120,10 +120,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace FindRootCertificate.
 namespace FindRootCertificateResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag, FabricIndex aAccessingFabricIndex) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.EncodeResponseCommandFabricScopedStructField(to_underlying(Fields::kCertificateDetails), aAccessingFabricIndex,
+    encoder.EncodeResponseCommandFabricScopedStructField(to_underlying(Fields::kCertificateDetails), aWriter.mAccessingFabricIndex,
                                                          certificateDetails);
     return encoder.Finalize();
 }
@@ -177,7 +177,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace LookupRootCertificate.
 namespace LookupRootCertificateResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kCaid), caid);
@@ -261,7 +261,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace TLSClientCSR.
 namespace TLSClientCSRResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kCcdid), ccdid);
@@ -364,10 +364,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace FindClientCertificate.
 namespace FindClientCertificateResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag, FabricIndex aAccessingFabricIndex) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
-    encoder.EncodeResponseCommandFabricScopedStructField(to_underlying(Fields::kCertificateDetails), aAccessingFabricIndex,
+    encoder.EncodeResponseCommandFabricScopedStructField(to_underlying(Fields::kCertificateDetails), aWriter.mAccessingFabricIndex,
                                                          certificateDetails);
     return encoder.Finalize();
 }
@@ -421,7 +421,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace LookupClientCertificate.
 namespace LookupClientCertificateResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kCcdid), ccdid);
diff --git a/zzz_generated/app-common/clusters/TlsClientManagement/Commands.h b/zzz_generated/app-common/clusters/TlsClientManagement/Commands.h
index 30e9ae8453b3cb..1ff08ff2cba3ac 100644
--- a/zzz_generated/app-common/clusters/TlsClientManagement/Commands.h
+++ b/zzz_generated/app-common/clusters/TlsClientManagement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -137,7 +138,7 @@ struct Type
 
     uint16_t endpointID = static_cast<uint16_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -207,7 +208,7 @@ struct Type
 
     DataModel::List<const Structs::TLSEndpointStruct::Type> endpoints;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/TlsClientManagement/Commands.ipp b/zzz_generated/app-common/clusters/TlsClientManagement/Commands.ipp
index d9cf683e55e03d..770a15e53074f1 100644
--- a/zzz_generated/app-common/clusters/TlsClientManagement/Commands.ipp
+++ b/zzz_generated/app-common/clusters/TlsClientManagement/Commands.ipp
@@ -79,7 +79,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace ProvisionEndpoint.
 namespace ProvisionEndpointResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kEndpointID), endpointID);
@@ -135,7 +135,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace FindEndpoint.
 namespace FindEndpointResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kEndpoints), endpoints);
diff --git a/zzz_generated/app-common/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurement/Commands.h b/zzz_generated/app-common/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurement/Commands.h
index 8b08fa6da510d1..e6168ce7447545 100644
--- a/zzz_generated/app-common/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurement/Commands.h
+++ b/zzz_generated/app-common/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/UnitLocalization/Commands.h b/zzz_generated/app-common/clusters/UnitLocalization/Commands.h
index be08d3222f9a93..62a5b9ac4dcb29 100644
--- a/zzz_generated/app-common/clusters/UnitLocalization/Commands.h
+++ b/zzz_generated/app-common/clusters/UnitLocalization/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/UnitTesting/Commands.h b/zzz_generated/app-common/clusters/UnitTesting/Commands.h
index 2cd8bf804ce3fe..8ee9f798baaaed 100644
--- a/zzz_generated/app-common/clusters/UnitTesting/Commands.h
+++ b/zzz_generated/app-common/clusters/UnitTesting/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -310,7 +311,7 @@ struct Type
 
     uint8_t returnValue = static_cast<uint8_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -375,7 +376,7 @@ struct Type
 
     uint8_t returnValue = static_cast<uint8_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -440,7 +441,7 @@ struct Type
 
     bool returnValue = static_cast<bool>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -515,7 +516,7 @@ struct Type
     SimpleEnum arg5 = static_cast<SimpleEnum>(0);
     bool arg6       = static_cast<bool>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -593,7 +594,7 @@ struct Type
 
     DataModel::List<const uint8_t> arg1;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -665,7 +666,7 @@ struct Type
     chip::VendorId arg1 = static_cast<chip::VendorId>(0);
     SimpleEnum arg2     = static_cast<SimpleEnum>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -757,7 +758,7 @@ struct Type
     Optional<uint8_t> value;
     Optional<DataModel::Nullable<uint8_t>> originalValue;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -884,7 +885,7 @@ struct Type
     Optional<bool> nullableOptionalListWasNull;
     Optional<DataModel::List<const SimpleEnum>> nullableOptionalListValue;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -981,7 +982,7 @@ struct Type
 
     bool value = static_cast<bool>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -1051,7 +1052,7 @@ struct Type
 
     Structs::SimpleStruct::Type arg1;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -1121,7 +1122,7 @@ struct Type
 
     uint64_t value = static_cast<uint64_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -1191,7 +1192,7 @@ struct Type
 
     uint64_t value = static_cast<uint64_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -1261,7 +1262,7 @@ struct Type
 
     chip::ByteSpan buffer;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -1331,7 +1332,7 @@ struct Type
 
     chip::ByteSpan payload;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -1406,7 +1407,7 @@ struct Type
     Globals::Structs::TestGlobalStruct::Type field1;
     Globals::TestGlobalEnum field2 = static_cast<Globals::TestGlobalEnum>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -1913,7 +1914,7 @@ struct Type
     uint8_t arg1         = static_cast<uint8_t>(0);
     uint64_t eventNumber = static_cast<uint64_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/UnitTesting/Commands.ipp b/zzz_generated/app-common/clusters/UnitTesting/Commands.ipp
index 420b980b1a1f78..fed6e3df412e2f 100644
--- a/zzz_generated/app-common/clusters/UnitTesting/Commands.ipp
+++ b/zzz_generated/app-common/clusters/UnitTesting/Commands.ipp
@@ -53,7 +53,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace Test.
 namespace TestSpecificResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kReturnValue), returnValue);
@@ -103,7 +103,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestNotHandled.
 namespace TestAddArgumentsResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kReturnValue), returnValue);
@@ -153,7 +153,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestSpecific.
 namespace TestSimpleArgumentResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kReturnValue), returnValue);
@@ -203,7 +203,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestUnknownCommand.
 namespace TestStructArrayArgumentResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kArg1), arg1);
@@ -289,7 +289,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestAddArguments.
 namespace TestListInt8UReverseResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kArg1), arg1);
@@ -345,7 +345,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestSimpleArgumentRequest.
 namespace TestEnumsResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kArg1), arg1);
@@ -431,7 +431,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestStructArrayArgumentRequest.
 namespace TestNullableOptionalResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kWasPresent), wasPresent);
@@ -502,7 +502,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestStructArgumentRequest.
 namespace TestComplexNullableOptionalResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kNullableIntWasNull), nullableIntWasNull);
@@ -693,7 +693,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestNestedStructArgumentRequest.
 namespace BooleanResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kValue), value);
@@ -749,7 +749,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestListStructArgumentRequest.
 namespace SimpleStructResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kArg1), arg1);
@@ -805,7 +805,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestListInt8UArgumentRequest.
 namespace TestEmitTestEventResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kValue), value);
@@ -861,7 +861,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestNestedStructListArgumentRequest.
 namespace TestEmitTestFabricScopedEventResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kValue), value);
@@ -917,7 +917,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestListNestedStructListArgumentRequest.
 namespace TestBatchHelperResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kBuffer), buffer);
@@ -973,7 +973,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestListInt8UReverseRequest.
 namespace StringEchoResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kPayload), payload);
@@ -1034,7 +1034,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestEnumsRequest.
 namespace GlobalEchoResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kField1), field1);
@@ -1487,7 +1487,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace TestDifferentVendorMeiRequest.
 namespace TestDifferentVendorMeiResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kArg1), arg1);
diff --git a/zzz_generated/app-common/clusters/UserLabel/Commands.h b/zzz_generated/app-common/clusters/UserLabel/Commands.h
index 1c27d18a3da2f8..ce3cbc83d0bf9f 100644
--- a/zzz_generated/app-common/clusters/UserLabel/Commands.h
+++ b/zzz_generated/app-common/clusters/UserLabel/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ValveConfigurationAndControl/Commands.h b/zzz_generated/app-common/clusters/ValveConfigurationAndControl/Commands.h
index ada973a2c7fd83..c686e147ec9a99 100644
--- a/zzz_generated/app-common/clusters/ValveConfigurationAndControl/Commands.h
+++ b/zzz_generated/app-common/clusters/ValveConfigurationAndControl/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/WakeOnLan/Commands.h b/zzz_generated/app-common/clusters/WakeOnLan/Commands.h
index 7a56bfd1c82a59..681c4e8f3bb096 100644
--- a/zzz_generated/app-common/clusters/WakeOnLan/Commands.h
+++ b/zzz_generated/app-common/clusters/WakeOnLan/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/WaterHeaterManagement/Commands.h b/zzz_generated/app-common/clusters/WaterHeaterManagement/Commands.h
index cfec93f445e451..3c2c08210c3a18 100644
--- a/zzz_generated/app-common/clusters/WaterHeaterManagement/Commands.h
+++ b/zzz_generated/app-common/clusters/WaterHeaterManagement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/WaterHeaterMode/Commands.h b/zzz_generated/app-common/clusters/WaterHeaterMode/Commands.h
index 99af8072ae2d41..b69f8b5960ff04 100644
--- a/zzz_generated/app-common/clusters/WaterHeaterMode/Commands.h
+++ b/zzz_generated/app-common/clusters/WaterHeaterMode/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -112,7 +113,7 @@ struct Type
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/WaterHeaterMode/Commands.ipp b/zzz_generated/app-common/clusters/WaterHeaterMode/Commands.ipp
index 6e8dc93cc424f2..67d83145ef67f9 100644
--- a/zzz_generated/app-common/clusters/WaterHeaterMode/Commands.ipp
+++ b/zzz_generated/app-common/clusters/WaterHeaterMode/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace ChangeToMode.
 namespace ChangeToModeResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kStatus), status);
diff --git a/zzz_generated/app-common/clusters/WebRTCTransportProvider/Commands.h b/zzz_generated/app-common/clusters/WebRTCTransportProvider/Commands.h
index f4dbb08de058f0..731c3f452fd048 100644
--- a/zzz_generated/app-common/clusters/WebRTCTransportProvider/Commands.h
+++ b/zzz_generated/app-common/clusters/WebRTCTransportProvider/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -159,7 +160,7 @@ struct Type
     Optional<DataModel::Nullable<uint16_t>> videoStreamID;
     Optional<DataModel::Nullable<uint16_t>> audioStreamID;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -260,7 +261,7 @@ struct Type
     Optional<DataModel::Nullable<uint16_t>> videoStreamID;
     Optional<DataModel::Nullable<uint16_t>> audioStreamID;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/WebRTCTransportProvider/Commands.ipp b/zzz_generated/app-common/clusters/WebRTCTransportProvider/Commands.ipp
index 10bff692c8a06f..8817e999b2c217 100644
--- a/zzz_generated/app-common/clusters/WebRTCTransportProvider/Commands.ipp
+++ b/zzz_generated/app-common/clusters/WebRTCTransportProvider/Commands.ipp
@@ -89,7 +89,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace SolicitOffer.
 namespace SolicitOfferResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kWebRTCSessionID), webRTCSessionID);
@@ -200,7 +200,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader, FabricIndex aAccessing
 } // namespace ProvideOffer.
 namespace ProvideOfferResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kWebRTCSessionID), webRTCSessionID);
diff --git a/zzz_generated/app-common/clusters/WebRTCTransportRequestor/Commands.h b/zzz_generated/app-common/clusters/WebRTCTransportRequestor/Commands.h
index 58c7b7dec453b0..f69132cd9863fc 100644
--- a/zzz_generated/app-common/clusters/WebRTCTransportRequestor/Commands.h
+++ b/zzz_generated/app-common/clusters/WebRTCTransportRequestor/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/WiFiNetworkDiagnostics/Commands.h b/zzz_generated/app-common/clusters/WiFiNetworkDiagnostics/Commands.h
index e016388e492695..698e3d0a015d74 100644
--- a/zzz_generated/app-common/clusters/WiFiNetworkDiagnostics/Commands.h
+++ b/zzz_generated/app-common/clusters/WiFiNetworkDiagnostics/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/WiFiNetworkManagement/Commands.h b/zzz_generated/app-common/clusters/WiFiNetworkManagement/Commands.h
index b8b7b3288b14a0..5d82a3443e79de 100644
--- a/zzz_generated/app-common/clusters/WiFiNetworkManagement/Commands.h
+++ b/zzz_generated/app-common/clusters/WiFiNetworkManagement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -105,7 +106,7 @@ struct Type
 
     chip::ByteSpan passphrase;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/WiFiNetworkManagement/Commands.ipp b/zzz_generated/app-common/clusters/WiFiNetworkManagement/Commands.ipp
index 56c001b35de10c..e48eac90c2b6f8 100644
--- a/zzz_generated/app-common/clusters/WiFiNetworkManagement/Commands.ipp
+++ b/zzz_generated/app-common/clusters/WiFiNetworkManagement/Commands.ipp
@@ -53,7 +53,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace NetworkPassphraseRequest.
 namespace NetworkPassphraseResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kPassphrase), passphrase);
diff --git a/zzz_generated/app-common/clusters/WindowCovering/Commands.h b/zzz_generated/app-common/clusters/WindowCovering/Commands.h
index daea2149c836b5..72446a6cfc1a80 100644
--- a/zzz_generated/app-common/clusters/WindowCovering/Commands.h
+++ b/zzz_generated/app-common/clusters/WindowCovering/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
diff --git a/zzz_generated/app-common/clusters/ZoneManagement/Commands.h b/zzz_generated/app-common/clusters/ZoneManagement/Commands.h
index 4087e1d586dfd3..ac4d769840658c 100644
--- a/zzz_generated/app-common/clusters/ZoneManagement/Commands.h
+++ b/zzz_generated/app-common/clusters/ZoneManagement/Commands.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <app/data-model/DecodableList.h>
+#include <app/data-model/Encode.h>
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/data-model/Nullable.h>
@@ -130,7 +131,7 @@ struct Type
 
     uint16_t zoneID = static_cast<uint16_t>(0);
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
@@ -238,7 +239,7 @@ struct Type
 
     DataModel::List<const Structs::TwoDCartesianZoneStruct::Type> zones;
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+    CHIP_ERROR Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const;
 
     using ResponseType = DataModel::NullObjectType;
 
diff --git a/zzz_generated/app-common/clusters/ZoneManagement/Commands.ipp b/zzz_generated/app-common/clusters/ZoneManagement/Commands.ipp
index ff8f35d605a85d..6ce73f21d8f201 100644
--- a/zzz_generated/app-common/clusters/ZoneManagement/Commands.ipp
+++ b/zzz_generated/app-common/clusters/ZoneManagement/Commands.ipp
@@ -59,7 +59,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace CreateTwoDCartesianZone.
 namespace CreateTwoDCartesianZoneResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kZoneID), zoneID);
@@ -148,7 +148,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
 } // namespace GetTwoDCartesianZone.
 namespace GetTwoDCartesianZoneResponse {
 
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+CHIP_ERROR Type::Encode(DataModel::TLVWriterWithAccessingFabricIndex & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
     encoder.Encode(to_underlying(Fields::kZones), zones);