diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
index cc55642ca02153..3cd8ff62e19e7d 100644
--- a/src/app/BUILD.gn
+++ b/src/app/BUILD.gn
@@ -41,6 +41,8 @@ static_library("app") {
     "CommandSender.cpp",
     "EventManagement.cpp",
     "InteractionModelEngine.cpp",
+    "MessageDef/ArrayBuilder.cpp",
+    "MessageDef/ArrayParser.cpp",
     "MessageDef/AttributeDataElement.cpp",
     "MessageDef/AttributeDataElement.h",
     "MessageDef/AttributeDataList.cpp",
@@ -76,9 +78,7 @@ static_library("app") {
     "MessageDef/InvokeCommand.cpp",
     "MessageDef/InvokeCommand.h",
     "MessageDef/ListBuilder.cpp",
-    "MessageDef/ListBuilder.h",
     "MessageDef/ListParser.cpp",
-    "MessageDef/ListParser.h",
     "MessageDef/MessageDefHelper.cpp",
     "MessageDef/MessageDefHelper.h",
     "MessageDef/Parser.cpp",
@@ -90,6 +90,8 @@ static_library("app") {
     "MessageDef/StatusIB.cpp",
     "MessageDef/StatusIB.h",
     "MessageDef/StatusResponse.cpp",
+    "MessageDef/StructBuilder.cpp",
+    "MessageDef/StructParser.cpp",
     "MessageDef/SubscribeRequest.cpp",
     "MessageDef/SubscribeResponse.cpp",
     "MessageDef/TimedRequestMessage.cpp",
diff --git a/src/app/MessageDef/ArrayBuilder.cpp b/src/app/MessageDef/ArrayBuilder.cpp
new file mode 100644
index 00000000000000..c1727e861fb954
--- /dev/null
+++ b/src/app/MessageDef/ArrayBuilder.cpp
@@ -0,0 +1,41 @@
+/**
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "ArrayBuilder.h"
+
+#include <inttypes.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+namespace chip {
+namespace app {
+CHIP_ERROR ArrayBuilder::Init(TLV::TLVWriter * const apWriter, const uint8_t aContextTagToUse)
+{
+    mpWriter = apWriter;
+    mError   = mpWriter->StartContainer(TLV::ContextTag(aContextTagToUse), chip::TLV::kTLVType_Array, mOuterContainerType);
+
+    return mError;
+}
+
+CHIP_ERROR ArrayBuilder::Init(TLV::TLVWriter * const apWriter)
+{
+    mpWriter = apWriter;
+    mError   = mpWriter->StartContainer(TLV::AnonymousTag, chip::TLV::kTLVType_Array, mOuterContainerType);
+
+    return mError;
+}
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/ArrayBuilder.h b/src/app/MessageDef/ArrayBuilder.h
new file mode 100644
index 00000000000000..b8a0a91341a9c4
--- /dev/null
+++ b/src/app/MessageDef/ArrayBuilder.h
@@ -0,0 +1,55 @@
+/**
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "Builder.h"
+#include "Parser.h"
+#include <app/util/basic-types.h>
+#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPTLV.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/logging/CHIPLogging.h>
+
+namespace chip {
+namespace app {
+class ArrayBuilder : public Builder
+{
+public:
+    /**
+     * Init the TLV array container with an particular context tag.
+     * Required to implement arrays of arrays, and to test ArrayBuilder.
+     *
+     * @param[in]   apWriter    Pointer to the TLVWriter that is encoding the message.
+     * @param[in]   aContextTagToUse    A contextTag to use.
+     *
+     * @return                  CHIP_ERROR codes returned by chip::TLV objects.
+     */
+
+    CHIP_ERROR Init(TLV::TLVWriter * const apWriter, const uint8_t aContextTagToUse);
+    /**
+     * Init the TLV array container with an anonymous tag.
+     * Required to implement arrays of arrays, and to test ArrayBuilder.
+     *
+     * @param[in]   apWriter    Pointer to the TLVWriter that is encoding the message.
+     *
+     * @return                  CHIP_ERROR codes returned by chip::TLV objects.
+     */
+    CHIP_ERROR Init(TLV::TLVWriter * const apWriter);
+};
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/ArrayParser.cpp b/src/app/MessageDef/ArrayParser.cpp
new file mode 100644
index 00000000000000..93bba53ec55886
--- /dev/null
+++ b/src/app/MessageDef/ArrayParser.cpp
@@ -0,0 +1,31 @@
+/**
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2018 Google LLC.
+ *    Copyright (c) 2016-2017 Nest Labs, Inc.
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "ArrayParser.h"
+
+namespace chip {
+namespace app {
+CHIP_ERROR ArrayParser::Init(const TLV::TLVReader & aReader)
+{
+    mReader.Init(aReader);
+    VerifyOrReturnError(TLV::kTLVType_Array == mReader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnLogErrorOnFailure(mReader.EnterContainer(mOuterContainerType));
+    return CHIP_NO_ERROR;
+}
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/ArrayParser.h b/src/app/MessageDef/ArrayParser.h
new file mode 100644
index 00000000000000..9531c534fce453
--- /dev/null
+++ b/src/app/MessageDef/ArrayParser.h
@@ -0,0 +1,38 @@
+/**
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2016-2017 Nest Labs, Inc.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "Parser.h"
+
+namespace chip {
+namespace app {
+class ArrayParser : public Parser
+{
+public:
+    /**
+     *  @brief Initialize the parser object with TLVReader
+     *
+     *  @param [in] aReader A pointer to a TLVReader, which should be on the element of the array element
+     *
+     *  @return #CHIP_NO_ERROR on success
+     */
+    CHIP_ERROR Init(const TLV::TLVReader & aReader);
+};
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/AttributeDataList.h b/src/app/MessageDef/AttributeDataList.h
index 9f38ab3c46c397..20949a064fd45d 100644
--- a/src/app/MessageDef/AttributeDataList.h
+++ b/src/app/MessageDef/AttributeDataList.h
@@ -23,9 +23,9 @@
 
 #pragma once
 
+#include "ArrayBuilder.h"
+#include "ArrayParser.h"
 #include "AttributeDataElement.h"
-#include "ListBuilder.h"
-#include "ListParser.h"
 
 #include <app/AppBuildConfig.h>
 #include <app/util/basic-types.h>
@@ -37,7 +37,7 @@
 namespace chip {
 namespace app {
 namespace AttributeDataList {
-class Parser : public ListParser
+class Parser : public ArrayParser
 {
 public:
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
@@ -58,7 +58,7 @@ class Parser : public ListParser
 #endif
 };
 
-class Builder : public ListBuilder
+class Builder : public ArrayBuilder
 {
 public:
     /**
diff --git a/src/app/MessageDef/AttributeDataVersionList.h b/src/app/MessageDef/AttributeDataVersionList.h
index 29b7095def62b7..cb079e18e470e6 100644
--- a/src/app/MessageDef/AttributeDataVersionList.h
+++ b/src/app/MessageDef/AttributeDataVersionList.h
@@ -23,9 +23,9 @@
 
 #pragma once
 
+#include "ArrayBuilder.h"
+#include "ArrayParser.h"
 #include "AttributeDataElement.h"
-#include "ListBuilder.h"
-#include "ListParser.h"
 
 #include <app/AppBuildConfig.h>
 #include <app/util/basic-types.h>
@@ -37,7 +37,7 @@
 namespace chip {
 namespace app {
 namespace AttributeDataVersionList {
-class Parser : public ListParser
+class Parser : public ArrayParser
 {
 public:
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
@@ -83,7 +83,7 @@ class Parser : public ListParser
     CHIP_ERROR GetVersion(chip::DataVersion * const apVersion);
 };
 
-class Builder : public ListBuilder
+class Builder : public ArrayBuilder
 {
 public:
     /**
diff --git a/src/app/MessageDef/AttributePathList.h b/src/app/MessageDef/AttributePathList.h
index f28d378465f269..11b475596a228b 100644
--- a/src/app/MessageDef/AttributePathList.h
+++ b/src/app/MessageDef/AttributePathList.h
@@ -23,9 +23,9 @@
 
 #pragma once
 
+#include "ArrayBuilder.h"
+#include "ArrayParser.h"
 #include "AttributePath.h"
-#include "ListBuilder.h"
-#include "ListParser.h"
 
 #include <app/AppBuildConfig.h>
 #include <app/util/basic-types.h>
@@ -37,7 +37,7 @@
 namespace chip {
 namespace app {
 namespace AttributePathList {
-class Parser : public ListParser
+class Parser : public ArrayParser
 {
 public:
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
@@ -58,7 +58,7 @@ class Parser : public ListParser
 #endif
 };
 
-class Builder : public ListBuilder
+class Builder : public ArrayBuilder
 {
 public:
     /**
diff --git a/src/app/MessageDef/AttributeStatusList.h b/src/app/MessageDef/AttributeStatusList.h
index 6ee48d9851a00a..78774a7fea11ee 100644
--- a/src/app/MessageDef/AttributeStatusList.h
+++ b/src/app/MessageDef/AttributeStatusList.h
@@ -23,9 +23,9 @@
 
 #pragma once
 
+#include "ArrayBuilder.h"
+#include "ArrayParser.h"
 #include "AttributeStatusIB.h"
-#include "ListBuilder.h"
-#include "ListParser.h"
 
 #include <app/AppBuildConfig.h>
 #include <app/util/basic-types.h>
@@ -37,7 +37,7 @@
 namespace chip {
 namespace app {
 namespace AttributeStatusList {
-class Builder : public ListBuilder
+class Builder : public ArrayBuilder
 {
 public:
     /**
@@ -58,7 +58,7 @@ class Builder : public ListBuilder
     AttributeStatusIB::Builder mAttributeStatusBuilder;
 };
 
-class Parser : public ListParser
+class Parser : public ArrayParser
 {
 public:
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
diff --git a/src/app/MessageDef/Builder.cpp b/src/app/MessageDef/Builder.cpp
index 2367d231fe5253..fed0811a34b19c 100644
--- a/src/app/MessageDef/Builder.cpp
+++ b/src/app/MessageDef/Builder.cpp
@@ -74,5 +74,5 @@ CHIP_ERROR Builder::InitAnonymousStructure(chip::TLV::TLVWriter * const apWriter
 
     return mError;
 }
-}; // namespace app
-}; // namespace chip
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/Builder.h b/src/app/MessageDef/Builder.h
index 347a67318fcde3..1ffbb3e78afdcf 100644
--- a/src/app/MessageDef/Builder.h
+++ b/src/app/MessageDef/Builder.h
@@ -85,15 +85,15 @@ class Builder
      */
     void Rollback(const chip::TLV::TLVWriter & aPoint) { *mpWriter = aPoint; }
 
+    void EndOfContainer();
+
 protected:
     CHIP_ERROR mError;
     chip::TLV::TLVWriter * mpWriter;
     chip::TLV::TLVType mOuterContainerType;
 
     Builder();
-    void EndOfContainer();
-
     CHIP_ERROR InitAnonymousStructure(chip::TLV::TLVWriter * const apWriter);
 };
-}; // namespace app
-}; // namespace chip
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/CommandDataIB.cpp b/src/app/MessageDef/CommandDataIB.cpp
index e42fe57ce85bab..c590fdc463bfdc 100644
--- a/src/app/MessageDef/CommandDataIB.cpp
+++ b/src/app/MessageDef/CommandDataIB.cpp
@@ -36,21 +36,6 @@ using namespace chip::TLV;
 
 namespace chip {
 namespace app {
-CHIP_ERROR CommandDataIB::Parser::Init(const chip::TLV::TLVReader & aReader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    // make a copy of the reader here
-    mReader.Init(aReader);
-
-    VerifyOrExit(chip::TLV::kTLVType_Structure == mReader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
-
-    err = mReader.EnterContainer(mOuterContainerType);
-
-exit:
-    return err;
-}
-
 CHIP_ERROR
 CommandDataIB::Parser::ParseData(chip::TLV::TLVReader & aReader, int aDepth) const
 {
@@ -370,11 +355,6 @@ CHIP_ERROR CommandDataIB::Parser::GetStatusIB(StatusIB::Parser * const apStatusI
     return err;
 }
 
-CHIP_ERROR CommandDataIB::Builder::Init(chip::TLV::TLVWriter * const apWriter)
-{
-    return InitAnonymousStructure(apWriter);
-}
-
 CommandPathIB::Builder & CommandDataIB::Builder::CreateCommandPathBuilder()
 {
     // skip if error has already been set
diff --git a/src/app/MessageDef/CommandDataIB.h b/src/app/MessageDef/CommandDataIB.h
index f3175caef54b16..fa6476e504dd4f 100644
--- a/src/app/MessageDef/CommandDataIB.h
+++ b/src/app/MessageDef/CommandDataIB.h
@@ -46,18 +46,9 @@ enum
     kCsTag_StatusIB    = 2,
 };
 
-class Parser : public chip::app::Parser
+class Parser : public StructParser
 {
 public:
-    /**
-     *  @brief Initialize the parser object with TLVReader
-     *
-     *  @param [in] aReader A pointer to a TLVReader, which should point to the beginning of this CommandDataIB
-     *
-     *  @return #CHIP_NO_ERROR on success
-     */
-    CHIP_ERROR Init(const chip::TLV::TLVReader & aReader);
-
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
     /**
      *  @brief Roughly verify the message is correctly formed
@@ -112,18 +103,9 @@ class Parser : public chip::app::Parser
     CHIP_ERROR ParseData(chip::TLV::TLVReader & aReader, int aDepth) const;
 };
 
-class Builder : public chip::app::Builder
+class Builder : public StructBuilder
 {
 public:
-    /**
-     *  @brief Initialize a AttributeDataList::Builder for writing into a TLV stream
-     *
-     *  @param [in] apWriter    A pointer to TLVWriter
-     *
-     *  @return #CHIP_NO_ERROR on success
-     */
-    CHIP_ERROR Init(chip::TLV::TLVWriter * const apWriter);
-
     /**
      *  @brief Initialize a CommandPathIB::Builder for writing into the TLV stream
      *
diff --git a/src/app/MessageDef/CommandList.h b/src/app/MessageDef/CommandList.h
index 3422ffe43eccde..ebf193a1da85d6 100644
--- a/src/app/MessageDef/CommandList.h
+++ b/src/app/MessageDef/CommandList.h
@@ -23,9 +23,9 @@
 
 #pragma once
 
+#include "ArrayBuilder.h"
+#include "ArrayParser.h"
 #include "CommandDataIB.h"
-#include "ListBuilder.h"
-#include "ListParser.h"
 
 #include <app/AppBuildConfig.h>
 #include <app/util/basic-types.h>
@@ -37,7 +37,7 @@
 namespace chip {
 namespace app {
 namespace CommandList {
-class Parser : public ListParser
+class Parser : public ArrayParser
 {
 public:
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
@@ -58,7 +58,7 @@ class Parser : public ListParser
 #endif
 };
 
-class Builder : public ListBuilder
+class Builder : public ArrayBuilder
 {
 public:
     /**
diff --git a/src/app/MessageDef/CommandPathIB.cpp b/src/app/MessageDef/CommandPathIB.cpp
index 70ae23be0f066e..fbda9de0b33507 100644
--- a/src/app/MessageDef/CommandPathIB.cpp
+++ b/src/app/MessageDef/CommandPathIB.cpp
@@ -36,22 +36,6 @@ using namespace chip::TLV;
 
 namespace chip {
 namespace app {
-CHIP_ERROR CommandPathIB::Parser::Init(const chip::TLV::TLVReader & aReader)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    // make a copy of the reader here
-    mReader.Init(aReader);
-
-    VerifyOrExit(chip::TLV::kTLVType_List == mReader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
-
-    err = mReader.EnterContainer(mOuterContainerType);
-
-exit:
-
-    return err;
-}
-
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 CHIP_ERROR CommandPathIB::Parser::CheckSchemaValidity() const
 {
@@ -154,26 +138,6 @@ CHIP_ERROR CommandPathIB::Parser::GetCommandId(chip::CommandId * const apCommand
     return GetUnsignedInteger(kCsTag_CommandId, apCommandId);
 }
 
-CHIP_ERROR CommandPathIB::Builder::_Init(chip::TLV::TLVWriter * const apWriter, const Tag aTag)
-{
-    mpWriter = apWriter;
-    mError   = mpWriter->StartContainer(aTag, chip::TLV::kTLVType_List, mOuterContainerType);
-    SuccessOrExit(mError);
-
-exit:
-    return mError;
-}
-
-CHIP_ERROR CommandPathIB::Builder::Init(chip::TLV::TLVWriter * const apWriter)
-{
-    return _Init(apWriter, chip::TLV::AnonymousTag);
-}
-
-CHIP_ERROR CommandPathIB::Builder::Init(chip::TLV::TLVWriter * const apWriter, const uint8_t aContextTagToUse)
-{
-    return _Init(apWriter, chip::TLV::ContextTag(aContextTagToUse));
-}
-
 CommandPathIB::Builder & CommandPathIB::Builder::EndpointId(const chip::EndpointId aEndpointId)
 {
     // skip if error has already been set
diff --git a/src/app/MessageDef/CommandPathIB.h b/src/app/MessageDef/CommandPathIB.h
index 0867c91f757e65..3450ac31efeb0a 100644
--- a/src/app/MessageDef/CommandPathIB.h
+++ b/src/app/MessageDef/CommandPathIB.h
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#include "Builder.h"
-#include "Parser.h"
+#include "ListBuilder.h"
+#include "ListParser.h"
 
 #include <app/AppBuildConfig.h>
 #include <app/util/basic-types.h>
@@ -43,18 +43,9 @@ enum
     kCsTag_CommandId  = 2,
 };
 
-class Parser : public chip::app::Parser
+class Parser : public ListParser
 {
 public:
-    /**
-     *  @brief Initialize the parser object with TLVReader
-     *
-     *  @param [in] aReader A pointer to a TLVReader, which should point to the beginning of this CommandPathIB
-     *
-     *  @return #CHIP_NO_ERROR on success
-     */
-    CHIP_ERROR Init(const chip::TLV::TLVReader & aReader);
-
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
     /**
      *  @brief Roughly verify the message is correctly formed
@@ -106,29 +97,9 @@ class Parser : public chip::app::Parser
     CHIP_ERROR GetCommandId(chip::CommandId * const apCommandId) const;
 };
 
-class Builder : public chip::app::Builder
+class Builder : public ListBuilder
 {
 public:
-    /**
-     *  @brief Initialize a CommandPathIB::Builder for writing into a TLV stream
-     *
-     *  @param [in] apWriter    A pointer to TLVWriter
-     *
-     *  @return #CHIP_NO_ERROR on success
-     */
-    CHIP_ERROR Init(chip::TLV::TLVWriter * const apWriter);
-
-    /**
-     * Init the CommandPathIB container with an particular context tag.
-     * Required to implement arrays of arrays, and to test ListBuilder.
-     *
-     * @param[in]   apWriter    Pointer to the TLVWriter that is encoding the message.
-     * @param[in]   aContextTagToUse    A contextTag to use.
-     *
-     * @return                  CHIP_ERROR codes returned by chip::TLV objects.
-     */
-    CHIP_ERROR Init(chip::TLV::TLVWriter * const apWriter, const uint8_t aContextTagToUse);
-
     /**
      *  @brief Inject EndpointId into the TLV stream to indicate the endpointId referenced by the path.
      *
@@ -162,9 +133,6 @@ class Builder : public chip::app::Builder
      *  @return A reference to *this
      */
     CommandPathIB::Builder & EndOfCommandPath();
-
-private:
-    CHIP_ERROR _Init(TLV::TLVWriter * const apWriter, const TLV::Tag aTag);
 };
 }; // namespace CommandPathIB
 
diff --git a/src/app/MessageDef/EventFilterIB.cpp b/src/app/MessageDef/EventFilterIB.cpp
index 9fbb3e063d52d6..09786dce6b8fe1 100644
--- a/src/app/MessageDef/EventFilterIB.cpp
+++ b/src/app/MessageDef/EventFilterIB.cpp
@@ -31,14 +31,6 @@
 
 namespace chip {
 namespace app {
-CHIP_ERROR EventFilterIB::Parser::Init(const chip::TLV::TLVReader & aReader)
-{
-    mReader.Init(aReader);
-    VerifyOrReturnError(chip::TLV::kTLVType_Structure == mReader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-    ReturnErrorOnFailure(mReader.EnterContainer(mOuterContainerType));
-    return CHIP_NO_ERROR;
-}
-
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 CHIP_ERROR EventFilterIB::Parser::CheckSchemaValidity() const
 {
@@ -117,11 +109,6 @@ CHIP_ERROR EventFilterIB::Parser::GetEventMin(uint64_t * const apEventMin) const
     return GetUnsignedInteger(to_underlying(Tag::kEventMin), apEventMin);
 }
 
-CHIP_ERROR EventFilterIB::Builder::Init(TLV::TLVWriter * const apWriter)
-{
-    return InitAnonymousStructure(apWriter);
-}
-
 EventFilterIB::Builder & EventFilterIB::Builder::Node(const NodeId aNode)
 {
     // skip if error has already been set
diff --git a/src/app/MessageDef/EventFilterIB.h b/src/app/MessageDef/EventFilterIB.h
index e97e3a6197eb7d..f0128133b781d3 100644
--- a/src/app/MessageDef/EventFilterIB.h
+++ b/src/app/MessageDef/EventFilterIB.h
@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "Builder.h"
-#include "Parser.h"
+#include "StructBuilder.h"
+#include "StructParser.h"
 
 #include <app/AppBuildConfig.h>
 #include <app/util/basic-types.h>
@@ -41,18 +41,9 @@ enum class Tag : uint8_t
     kEventMin = 1,
 };
 
-class Parser : public chip::app::Parser
+class Parser : public StructParser
 {
 public:
-    /**
-     *  @brief Initialize the parser object with TLVReader
-     *
-     *  @param [in] aReader A pointer to a TLVReader, which should point to the beginning of this EventFilterIB
-     *
-     *  @return #CHIP_NO_ERROR on success
-     */
-    CHIP_ERROR Init(const chip::TLV::TLVReader & aReader);
-
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
     /**
      *  @brief Roughly verify the message is correctly formed
@@ -93,18 +84,9 @@ class Parser : public chip::app::Parser
     CHIP_ERROR GetEventMin(uint64_t * const apEventMin) const;
 };
 
-class Builder : public chip::app::Builder
+class Builder : public StructBuilder
 {
 public:
-    /**
-     *  @brief Initialize a EventFilterIB::Builder for writing into a TLV stream
-     *
-     *  @param [in] apWriter    A pointer to TLVWriter
-     *
-     *  @return #CHIP_NO_ERROR on success
-     */
-    CHIP_ERROR Init(chip::TLV::TLVWriter * const apWriter);
-
     /**
      *  @brief Inject Node into the TLV stream to indicate the nodeId referenced by the event filter.
      *
diff --git a/src/app/MessageDef/EventFilters.h b/src/app/MessageDef/EventFilters.h
index baa340dc76d355..fb67e7342bec26 100644
--- a/src/app/MessageDef/EventFilters.h
+++ b/src/app/MessageDef/EventFilters.h
@@ -29,14 +29,14 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 
+#include "ArrayBuilder.h"
+#include "ArrayParser.h"
 #include "EventFilterIB.h"
-#include "ListBuilder.h"
-#include "ListParser.h"
 
 namespace chip {
 namespace app {
 namespace EventFilters {
-class Parser : public ListParser
+class Parser : public ArrayParser
 {
 public:
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
@@ -57,7 +57,7 @@ class Parser : public ListParser
 #endif
 };
 
-class Builder : public ListBuilder
+class Builder : public ArrayBuilder
 {
 public:
     /**
diff --git a/src/app/MessageDef/EventList.h b/src/app/MessageDef/EventList.h
index b90db97c122f32..c3550a24d5a276 100644
--- a/src/app/MessageDef/EventList.h
+++ b/src/app/MessageDef/EventList.h
@@ -23,9 +23,9 @@
 
 #pragma once
 
+#include "ArrayBuilder.h"
+#include "ArrayParser.h"
 #include "EventDataElement.h"
-#include "ListBuilder.h"
-#include "ListParser.h"
 
 #include <app/AppBuildConfig.h>
 #include <app/util/basic-types.h>
@@ -37,7 +37,7 @@
 namespace chip {
 namespace app {
 namespace EventList {
-class Parser : public ListParser
+class Parser : public ArrayParser
 {
 public:
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
@@ -58,7 +58,7 @@ class Parser : public ListParser
 #endif
 };
 
-class Builder : public ListBuilder
+class Builder : public ArrayBuilder
 {
 public:
     /**
diff --git a/src/app/MessageDef/EventPathList.h b/src/app/MessageDef/EventPathList.h
index 1ef4987f61f182..f236a04ceb3c8f 100644
--- a/src/app/MessageDef/EventPathList.h
+++ b/src/app/MessageDef/EventPathList.h
@@ -23,10 +23,10 @@
 
 #pragma once
 
+#include "ArrayBuilder.h"
+#include "ArrayParser.h"
 #include "EventPath.h"
 #include "EventPathList.h"
-#include "ListBuilder.h"
-#include "ListParser.h"
 
 #include <app/AppBuildConfig.h>
 #include <app/util/basic-types.h>
@@ -38,7 +38,7 @@
 namespace chip {
 namespace app {
 namespace EventPathList {
-class Parser : public ListParser
+class Parser : public ArrayParser
 {
 public:
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
@@ -59,7 +59,7 @@ class Parser : public ListParser
 #endif
 };
 
-class Builder : public ListBuilder
+class Builder : public ArrayBuilder
 {
 public:
     /**
diff --git a/src/app/MessageDef/ListBuilder.cpp b/src/app/MessageDef/ListBuilder.cpp
index 5ba483951d879f..54114c00b9795b 100644
--- a/src/app/MessageDef/ListBuilder.cpp
+++ b/src/app/MessageDef/ListBuilder.cpp
@@ -15,11 +15,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-/**
- *    @file
- *      This file defines List builder in CHIP interaction model
- *
- */
 
 #include "ListBuilder.h"
 
@@ -27,27 +22,22 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-using namespace chip;
-using namespace chip::TLV;
-
 namespace chip {
 namespace app {
-ListBuilder::ListBuilder() {}
-
-CHIP_ERROR ListBuilder::Init(chip::TLV::TLVWriter * const apWriter, const uint8_t aContextTagToUse)
+CHIP_ERROR ListBuilder::Init(TLV::TLVWriter * const apWriter, const uint8_t aContextTagToUse)
 {
     mpWriter = apWriter;
-    mError   = mpWriter->StartContainer(chip::TLV::ContextTag(aContextTagToUse), chip::TLV::kTLVType_Array, mOuterContainerType);
+    mError   = mpWriter->StartContainer(TLV::ContextTag(aContextTagToUse), TLV::kTLVType_List, mOuterContainerType);
 
     return mError;
 }
 
-CHIP_ERROR ListBuilder::Init(chip::TLV::TLVWriter * const apWriter)
+CHIP_ERROR ListBuilder::Init(TLV::TLVWriter * const apWriter)
 {
     mpWriter = apWriter;
-    mError   = mpWriter->StartContainer(chip::TLV::AnonymousTag, chip::TLV::kTLVType_Array, mOuterContainerType);
+    mError   = mpWriter->StartContainer(TLV::AnonymousTag, TLV::kTLVType_List, mOuterContainerType);
 
     return mError;
 }
-}; // namespace app
-}; // namespace chip
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/ListBuilder.h b/src/app/MessageDef/ListBuilder.h
index b0a27380d3dfab..56ce2dc4d27701 100644
--- a/src/app/MessageDef/ListBuilder.h
+++ b/src/app/MessageDef/ListBuilder.h
@@ -15,11 +15,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-/**
- *    @file
- *      This file defines List builder in CHIP interaction model
- *
- */
 
 #pragma once
 
@@ -33,11 +28,8 @@
 
 namespace chip {
 namespace app {
-class ListBuilder : public chip::app::Builder
+class ListBuilder : public Builder
 {
-protected:
-    ListBuilder();
-
 public:
     /**
      * Init the TLV array container with an particular context tag.
@@ -49,7 +41,7 @@ class ListBuilder : public chip::app::Builder
      * @return                  CHIP_ERROR codes returned by chip::TLV objects.
      */
 
-    CHIP_ERROR Init(chip::TLV::TLVWriter * const apWriter, const uint8_t aContextTagToUse);
+    CHIP_ERROR Init(TLV::TLVWriter * const apWriter, const uint8_t aContextTagToUse);
     /**
      * Init the TLV array container with an anonymous tag.
      * Required to implement arrays of arrays, and to test ListBuilder.
@@ -58,8 +50,7 @@ class ListBuilder : public chip::app::Builder
      *
      * @return                  CHIP_ERROR codes returned by chip::TLV objects.
      */
-    CHIP_ERROR Init(chip::TLV::TLVWriter * const apWriter);
+    CHIP_ERROR Init(TLV::TLVWriter * const apWriter);
 };
-
-}; // namespace app
-}; // namespace chip
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/ListParser.cpp b/src/app/MessageDef/ListParser.cpp
index cc3811e2aa3371..4d0b7fbdf6c42e 100644
--- a/src/app/MessageDef/ListParser.cpp
+++ b/src/app/MessageDef/ListParser.cpp
@@ -15,65 +15,17 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-/**
- *    @file
- *     This file defines List parser in CHIP interaction model
- *
- */
 
 #include "ListParser.h"
 
-#include <inttypes.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-using namespace chip;
-using namespace chip::TLV;
-
 namespace chip {
 namespace app {
-ListParser::ListParser() {}
-
-CHIP_ERROR ListParser::Init(const chip::TLV::TLVReader & aReader)
+CHIP_ERROR ListParser::Init(const TLV::TLVReader & aReader)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    // make a copy of the reader here
     mReader.Init(aReader);
-
-    VerifyOrExit(chip::TLV::kTLVType_Array == mReader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
-
-    err = mReader.EnterContainer(mOuterContainerType);
-
-exit:
-
-    return err;
-}
-
-CHIP_ERROR ListParser::InitIfPresent(const chip::TLV::TLVReader & aReader, const uint8_t aContextTagToFind)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    chip::TLV::TLVReader reader;
-
-    err = mReader.FindElementWithTag(chip::TLV::ContextTag(aContextTagToFind), reader);
-    SuccessOrExit(err);
-
-    err = Init(reader);
-    SuccessOrExit(err);
-
-exit:
-    ChipLogIfFalse((CHIP_NO_ERROR == err) || (CHIP_END_OF_TLV == err));
-
-    return err;
-}
-
-CHIP_ERROR ListParser::Next()
-{
-    CHIP_ERROR err = mReader.Next();
-
-    ChipLogIfFalse((CHIP_NO_ERROR == err) || (CHIP_END_OF_TLV == err));
-
-    return err;
+    VerifyOrReturnError(TLV::kTLVType_List == mReader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnLogErrorOnFailure(mReader.EnterContainer(mOuterContainerType));
+    return CHIP_NO_ERROR;
 }
-}; // namespace app
-}; // namespace chip
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/ListParser.h b/src/app/MessageDef/ListParser.h
index dc33ba271b0a4c..e0632690524576 100644
--- a/src/app/MessageDef/ListParser.h
+++ b/src/app/MessageDef/ListParser.h
@@ -15,56 +15,24 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-/**
- *    @file
- *      This file defines List parser in CHIP interaction model
- *
- */
 
 #pragma once
 
-#include "Builder.h"
 #include "Parser.h"
-#include <app/util/basic-types.h>
-#include <lib/core/CHIPCore.h>
-#include <lib/core/CHIPTLV.h>
-#include <lib/support/CodeUtils.h>
-#include <lib/support/logging/CHIPLogging.h>
 
 namespace chip {
 namespace app {
-class ListParser : public chip::app::Parser
+class ListParser : public Parser
 {
-protected:
-    ListParser();
-
 public:
     /**
      *  @brief Initialize the parser object with TLVReader
      *
-     *  @param [in] aReader A pointer to a TLVReader, which should be on the element of the array element
-     *
-     *  @return #CHIP_NO_ERROR on success
-     */
-    CHIP_ERROR Init(const chip::TLV::TLVReader & aReader);
-
-    /**
-     *  @brief Initialize the parser object with TLVReader if context tag exists
-     *
-     *  @param [in] aReader A pointer to a TLVReader, which should be on the element of the array element
-     *  @param [in] aContextTagToFind A context tag it tries to find
-     *
-     *  @return #CHIP_NO_ERROR on success
-     */
-    CHIP_ERROR InitIfPresent(const chip::TLV::TLVReader & aReader, const uint8_t aContextTagToFind);
-
-    /**
-     *  @brief Iterate to next element
+     *  @param [in] aReader A pointer to a TLVReader, which should be on the element of the list element
      *
      *  @return #CHIP_NO_ERROR on success
      */
-    CHIP_ERROR Next();
+    CHIP_ERROR Init(const TLV::TLVReader & aReader);
 };
-
-}; // namespace app
-}; // namespace chip
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/Parser.cpp b/src/app/MessageDef/Parser.cpp
index 98b30f6ed38660..04aaea0f36b7e7 100644
--- a/src/app/MessageDef/Parser.cpp
+++ b/src/app/MessageDef/Parser.cpp
@@ -27,9 +27,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-using namespace chip;
-using namespace chip::TLV;
-
 namespace chip {
 namespace app {
 
@@ -41,7 +38,7 @@ void Parser::Init(const chip::TLV::TLVReader & aReader, chip::TLV::TLVType aOute
     mOuterContainerType = aOuterContainerType;
 }
 
-CHIP_ERROR Parser::GetReaderOnTag(const Tag aTagToFind, chip::TLV::TLVReader * const apReader) const
+CHIP_ERROR Parser::GetReaderOnTag(const TLV::Tag aTagToFind, chip::TLV::TLVReader * const apReader) const
 {
     return mReader.FindElementWithTag(aTagToFind, *apReader);
 }
@@ -50,5 +47,12 @@ void Parser::GetReader(chip::TLV::TLVReader * const apReader)
 {
     apReader->Init(mReader);
 }
-}; // namespace app
-}; // namespace chip
+
+CHIP_ERROR Parser::Next()
+{
+    CHIP_ERROR err = mReader.Next();
+    ChipLogIfFalse((CHIP_NO_ERROR == err) || (CHIP_END_OF_TLV == err));
+    return err;
+}
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/Parser.h b/src/app/MessageDef/Parser.h
index 0b027a93002474..446703bf417ccf 100644
--- a/src/app/MessageDef/Parser.h
+++ b/src/app/MessageDef/Parser.h
@@ -62,6 +62,13 @@ class Parser
      */
     void GetReader(chip::TLV::TLVReader * const apReader);
 
+    /**
+     *  @brief Iterate to next element
+     *
+     *  @return #CHIP_NO_ERROR on success
+     */
+    CHIP_ERROR Next();
+
 protected:
     chip::TLV::TLVReader mReader;
     chip::TLV::TLVType mOuterContainerType;
@@ -95,5 +102,5 @@ class Parser
         return err;
     };
 };
-}; // namespace app
-}; // namespace chip
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/StatusIB.cpp b/src/app/MessageDef/StatusIB.cpp
index eb71ab8bfbd412..77f72c5e388005 100644
--- a/src/app/MessageDef/StatusIB.cpp
+++ b/src/app/MessageDef/StatusIB.cpp
@@ -135,18 +135,6 @@ CHIP_ERROR StatusIB::Parser::CheckSchemaValidity() const
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
-CHIP_ERROR StatusIB::Builder::Init(TLV::TLVWriter * const apWriter)
-{
-    return InitAnonymousStructure(apWriter);
-}
-
-CHIP_ERROR StatusIB::Builder::Init(TLV::TLVWriter * const apWriter, const uint8_t aContextTagToUse)
-{
-    mpWriter = apWriter;
-    mError   = mpWriter->StartContainer(TLV::ContextTag(aContextTagToUse), TLV::kTLVType_Structure, mOuterContainerType);
-    return mError;
-}
-
 StatusIB::Builder & StatusIB::Builder::EncodeStatusIB(const StatusIB & aStatusIB)
 {
     mError = mpWriter->Put(TLV::ContextTag(to_underlying(Tag::kStatus)), aStatusIB.mStatus);
diff --git a/src/app/MessageDef/StatusIB.h b/src/app/MessageDef/StatusIB.h
index 80b7bfff9256c2..679680815714b8 100644
--- a/src/app/MessageDef/StatusIB.h
+++ b/src/app/MessageDef/StatusIB.h
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#include "ListBuilder.h"
-#include "ListParser.h"
+#include "StructBuilder.h"
+#include "StructParser.h"
 
 #include <app/AppBuildConfig.h>
 #include <app/util/basic-types.h>
@@ -52,7 +52,7 @@ struct StatusIB
         kClusterStatus = 1,
     };
 
-    class Parser : public chip::app::Parser
+    class Parser : public StructParser
     {
     public:
         /**
@@ -91,29 +91,9 @@ struct StatusIB
         CHIP_ERROR DecodeStatusIB(StatusIB & aStatusIB) const;
     };
 
-    class Builder : public chip::app::Builder
+    class Builder : public StructBuilder
     {
     public:
-        /**
-         *  @brief Initialize a StatusIB::Builder for writing into a TLV stream
-         *
-         *  @param [in] apWriter    A pointer to TLVWriter
-         *
-         *  @return #CHIP_NO_ERROR on success
-         */
-        CHIP_ERROR Init(TLV::TLVWriter * const apWriter);
-
-        /**
-         * Init the StatusIB container with an particular context tag.
-         * Required to implement arrays of arrays, and to test ListBuilder.
-         *
-         * @param[in]   apWriter    Pointer to the TLVWriter that is encoding the message.
-         * @param[in]   aContextTagToUse    A contextTag to use.
-         *
-         * @return                  CHIP_ERROR codes returned by chip::TLV objects.
-         */
-        CHIP_ERROR Init(TLV::TLVWriter * const apWriter, const uint8_t aContextTagToUse);
-
         /**
          * Write the StatusIB into TLV and close the container
          *
diff --git a/src/app/MessageDef/StructBuilder.cpp b/src/app/MessageDef/StructBuilder.cpp
new file mode 100644
index 00000000000000..261187e81889c6
--- /dev/null
+++ b/src/app/MessageDef/StructBuilder.cpp
@@ -0,0 +1,39 @@
+/**
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "StructBuilder.h"
+
+#include <inttypes.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+namespace chip {
+namespace app {
+CHIP_ERROR StructBuilder::Init(TLV::TLVWriter * const apWriter, const uint8_t aContextTagToUse)
+{
+    mpWriter = apWriter;
+    mError   = mpWriter->StartContainer(TLV::ContextTag(aContextTagToUse), TLV::kTLVType_Structure, mOuterContainerType);
+    return mError;
+}
+
+CHIP_ERROR StructBuilder::Init(TLV::TLVWriter * const apWriter)
+{
+    mpWriter = apWriter;
+    mError   = mpWriter->StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, mOuterContainerType);
+    return mError;
+}
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/StructBuilder.h b/src/app/MessageDef/StructBuilder.h
new file mode 100644
index 00000000000000..4d0bea948f5e79
--- /dev/null
+++ b/src/app/MessageDef/StructBuilder.h
@@ -0,0 +1,55 @@
+/**
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "Builder.h"
+#include "Parser.h"
+#include <app/util/basic-types.h>
+#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPTLV.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/logging/CHIPLogging.h>
+
+namespace chip {
+namespace app {
+class StructBuilder : public Builder
+{
+public:
+    /**
+     * Init the TLV array container with an particular context tag.
+     * Required to implement arrays of arrays, and to test StructBuilder.
+     *
+     * @param[in]   apWriter    Pointer to the TLVWriter that is encoding the message.
+     * @param[in]   aContextTagToUse    A contextTag to use.
+     *
+     * @return                  CHIP_ERROR codes returned by chip::TLV objects.
+     */
+
+    CHIP_ERROR Init(TLV::TLVWriter * const apWriter, const uint8_t aContextTagToUse);
+    /**
+     * Init the TLV array container with an anonymous tag.
+     * Required to implement arrays of arrays, and to test StructBuilder.
+     *
+     * @param[in]   apWriter    Pointer to the TLVWriter that is encoding the message.
+     *
+     * @return                  CHIP_ERROR codes returned by chip::TLV objects.
+     */
+    CHIP_ERROR Init(TLV::TLVWriter * const apWriter);
+};
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/StructParser.cpp b/src/app/MessageDef/StructParser.cpp
new file mode 100644
index 00000000000000..8b960b81e3e8da
--- /dev/null
+++ b/src/app/MessageDef/StructParser.cpp
@@ -0,0 +1,29 @@
+/**
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "StructParser.h"
+
+namespace chip {
+namespace app {
+CHIP_ERROR StructParser::Init(const TLV::TLVReader & aReader)
+{
+    mReader.Init(aReader);
+    VerifyOrReturnError(TLV::kTLVType_Structure == mReader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
+    ReturnLogErrorOnFailure(mReader.EnterContainer(mOuterContainerType));
+    return CHIP_NO_ERROR;
+}
+} // namespace app
+} // namespace chip
diff --git a/src/app/MessageDef/StructParser.h b/src/app/MessageDef/StructParser.h
new file mode 100644
index 00000000000000..6206ec1bd29543
--- /dev/null
+++ b/src/app/MessageDef/StructParser.h
@@ -0,0 +1,38 @@
+/**
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2016-2017 Nest Labs, Inc.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "Parser.h"
+
+namespace chip {
+namespace app {
+class StructParser : public Parser
+{
+public:
+    /**
+     *  @brief Initialize the parser object with TLVReader
+     *
+     *  @param [in] aReader A pointer to a TLVReader, which should be on the element of the struct element
+     *
+     *  @return #CHIP_NO_ERROR on success
+     */
+    CHIP_ERROR Init(const TLV::TLVReader & aReader);
+};
+} // namespace app
+} // namespace chip
diff --git a/src/app/tests/BUILD.gn b/src/app/tests/BUILD.gn
index 9bfd53e0622530..6367de8c153fd2 100644
--- a/src/app/tests/BUILD.gn
+++ b/src/app/tests/BUILD.gn
@@ -42,6 +42,7 @@ chip_test_suite("tests") {
 
   test_sources = [
     "TestAttributeValueEncoder.cpp",
+    "TestBuilderParser.cpp",
     "TestCHIPDeviceCallbacksMgr.cpp",
     "TestClusterInfo.cpp",
     "TestCommandPathParams.cpp",
diff --git a/src/app/tests/TestBuilderParser.cpp b/src/app/tests/TestBuilderParser.cpp
new file mode 100644
index 00000000000000..74ff9af2a0eb5e
--- /dev/null
+++ b/src/app/tests/TestBuilderParser.cpp
@@ -0,0 +1,145 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <app/AppBuildConfig.h>
+#include <app/MessageDef/ArrayBuilder.h>
+#include <app/MessageDef/ArrayParser.h>
+#include <app/MessageDef/ListBuilder.h>
+#include <app/MessageDef/ListParser.h>
+#include <app/MessageDef/StructBuilder.h>
+#include <app/MessageDef/StructParser.h>
+#include <lib/core/CHIPError.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/UnitTestRegistration.h>
+#include <system/TLVPacketBufferBackingStore.h>
+
+#include <nlunit-test.h>
+
+namespace {
+
+using namespace chip::app;
+
+void ListTest(nlTestSuite * apSuite, void * apContext)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    chip::System::PacketBufferTLVWriter writer;
+    chip::System::PacketBufferTLVReader reader;
+    writer.Init(chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSize));
+    ListBuilder listBuilder;
+    NL_TEST_ASSERT(apSuite, listBuilder.Init(&writer) == CHIP_NO_ERROR);
+    listBuilder.EndOfContainer();
+
+    chip::System::PacketBufferHandle buf;
+    err = writer.Finalize(&buf);
+
+    ListParser listParser;
+    reader.Init(std::move(buf));
+    err = reader.Next();
+    NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(apSuite, listParser.Init(reader) == CHIP_NO_ERROR);
+}
+
+void StructTest(nlTestSuite * apSuite, void * apContext)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    chip::System::PacketBufferTLVWriter writer;
+    chip::System::PacketBufferTLVReader reader;
+    writer.Init(chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSize));
+    StructBuilder structBuilder;
+    NL_TEST_ASSERT(apSuite, structBuilder.Init(&writer) == CHIP_NO_ERROR);
+    structBuilder.EndOfContainer();
+
+    chip::System::PacketBufferHandle buf;
+    err = writer.Finalize(&buf);
+
+    StructParser structParser;
+    reader.Init(std::move(buf));
+    err = reader.Next();
+
+    NL_TEST_ASSERT(apSuite, structParser.Init(reader) == CHIP_NO_ERROR);
+}
+
+void ArrayTest(nlTestSuite * apSuite, void * apContext)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    chip::System::PacketBufferTLVWriter writer;
+    chip::System::PacketBufferTLVReader reader;
+    writer.Init(chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSize));
+    ArrayBuilder arrayBuilder;
+    NL_TEST_ASSERT(apSuite, arrayBuilder.Init(&writer) == CHIP_NO_ERROR);
+    arrayBuilder.EndOfContainer();
+
+    chip::System::PacketBufferHandle buf;
+    err = writer.Finalize(&buf);
+
+    ArrayParser arrayParser;
+    reader.Init(std::move(buf));
+    err = reader.Next();
+
+    NL_TEST_ASSERT(apSuite, arrayParser.Init(reader) == CHIP_NO_ERROR);
+}
+
+// clang-format off
+const nlTest sTests[] =
+        {
+                NL_TEST_DEF("ListTest", ListTest),
+                NL_TEST_DEF("StructTest", StructTest),
+                NL_TEST_DEF("ArrayTest", ArrayTest),
+                NL_TEST_SENTINEL()
+        };
+// clang-format on
+} // namespace
+
+/**
+ *  Set up the test suite.
+ */
+static int TestSetup(void * inContext)
+{
+    CHIP_ERROR error = chip::Platform::MemoryInit();
+    if (error != CHIP_NO_ERROR)
+        return FAILURE;
+    return SUCCESS;
+}
+
+/**
+ *  Tear down the test suite.
+ */
+static int TestTeardown(void * inContext)
+{
+    chip::Platform::MemoryShutdown();
+    return SUCCESS;
+}
+
+int TestBuilderParser()
+{
+    // clang-format off
+    nlTestSuite theSuite =
+	{
+        "TestBuilderParser",
+        &sTests[0],
+        TestSetup,
+        TestTeardown,
+    };
+    // clang-format on
+
+    nlTestRunner(&theSuite, nullptr);
+
+    return (nlTestRunnerStats(&theSuite));
+}
+
+CHIP_REGISTER_TEST_SUITE(TestBuilderParser)
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 73ba96d648c921..fe366bbf9678f8 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -5332,7 +5332,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> modeSelectClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> modeSelectchangeToModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo modeSelectchangeToModeCommandParameterInfo =
         new CommandParameterInfo("ModeSelect", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo modeSelectchangeToModenewModeCommandParameterInfo =