diff --git a/MVMCoreUI/Atoms/TextFields/BaseDropdownEntryFieldModel.swift b/MVMCoreUI/Atoms/TextFields/BaseDropdownEntryFieldModel.swift
index e6e7cb24..496625dc 100644
--- a/MVMCoreUI/Atoms/TextFields/BaseDropdownEntryFieldModel.swift
+++ b/MVMCoreUI/Atoms/TextFields/BaseDropdownEntryFieldModel.swift
@@ -37,9 +37,9 @@
     }
     
     public override func encode(to encoder: Encoder) throws {
-        try super.encode(to: encoder)
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(caretView, forKey: .caretView)
     }
 }
diff --git a/MVMCoreUI/Atoms/TextFields/TextFieldModel.swift b/MVMCoreUI/Atoms/TextFields/TextFieldModel.swift
index 6caa70b0..e26995d6 100644
--- a/MVMCoreUI/Atoms/TextFields/TextFieldModel.swift
+++ b/MVMCoreUI/Atoms/TextFields/TextFieldModel.swift
@@ -12,7 +12,7 @@ import UIKit
 
     public static var identifier: String = "textField"
     public var backgroundColor: Color?
-    public var moleculeName: String
+    public var moleculeName: String? = TextFieldModel.identifier
     public var editable: Bool?
     public var disabled: Bool?
     public var errorMsg: String?
diff --git a/MVMCoreUI/Atoms/Views/CaretViewModel.swift b/MVMCoreUI/Atoms/Views/CaretViewModel.swift
index 58291984..cf90496f 100644
--- a/MVMCoreUI/Atoms/Views/CaretViewModel.swift
+++ b/MVMCoreUI/Atoms/Views/CaretViewModel.swift
@@ -18,6 +18,7 @@ import Foundation
     public var lineWidth: CGFloat?
     
     private enum CodingKeys: String, CodingKey {
+        case moleculeName
         case backgroundColor
         case strokeColor
         case isHidden
@@ -38,6 +39,7 @@ import Foundation
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(strokeColor, forKey: .strokeColor)
         try container.encodeIfPresent(isHidden, forKey: .isHidden)
         try container.encodeIfPresent(isOpaque, forKey: .isOpaque)
diff --git a/MVMCoreUI/Atoms/Views/CheckboxModel.swift b/MVMCoreUI/Atoms/Views/CheckboxModel.swift
index aa5dedb4..de79c6c6 100644
--- a/MVMCoreUI/Atoms/Views/CheckboxModel.swift
+++ b/MVMCoreUI/Atoms/Views/CheckboxModel.swift
@@ -39,6 +39,7 @@ import Foundation
     //--------------------------------------------------
     
     private enum CodingKeys: String, CodingKey {
+        case moleculeName
         case groupName
         case value
         case fieldKey
@@ -85,6 +86,7 @@ import Foundation
 
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(groupName, forKey: .groupName)
         try container.encodeIfPresent(value, forKey: .value)
         try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
diff --git a/MVMCoreUI/Atoms/Views/DashLineModel.swift b/MVMCoreUI/Atoms/Views/DashLineModel.swift
index 1346b5c2..7f5ac992 100644
--- a/MVMCoreUI/Atoms/Views/DashLineModel.swift
+++ b/MVMCoreUI/Atoms/Views/DashLineModel.swift
@@ -20,6 +20,7 @@ import Foundation
     }
     
     private enum CodingKeys: String, CodingKey {
+        case moleculeName
         case backgroundColor
         case dashColor
         case isHidden
@@ -36,6 +37,7 @@ import Foundation
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(dashColor, forKey: .dashColor)
         try container.encodeIfPresent(isHidden, forKey: .isHidden)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
diff --git a/MVMCoreUI/Atoms/Views/ImageViewModel.swift b/MVMCoreUI/Atoms/Views/ImageViewModel.swift
index 97f31ad2..d23289bf 100644
--- a/MVMCoreUI/Atoms/Views/ImageViewModel.swift
+++ b/MVMCoreUI/Atoms/Views/ImageViewModel.swift
@@ -11,6 +11,7 @@ import Foundation
 @objcMembers public class ImageViewModel: MoleculeModelProtocol {
     public static var identifier: String = "image"
     public var backgroundColor: Color?
+    public var moleculeName: String? = ImageViewModel.identifier
     public var image: String
     public var accessibilityText: String?
     public var fallbackImage: String?
diff --git a/MVMCoreUI/Atoms/Views/LeftRightLabelModel.swift b/MVMCoreUI/Atoms/Views/LeftRightLabelModel.swift
index 325611ec..d7ee1553 100644
--- a/MVMCoreUI/Atoms/Views/LeftRightLabelModel.swift
+++ b/MVMCoreUI/Atoms/Views/LeftRightLabelModel.swift
@@ -10,7 +10,12 @@ import UIKit
 
 @objcMembers public class LeftRightLabelModel: MoleculeModelProtocol {
     public static var identifier: String = "leftRightLabelView"
+    public var moleculeName: String? = LeftRightLabelModel.identifier
     public var backgroundColor: Color?
     public var leftText: LabelModel
     public var rightText: LabelModel?
+
+    init(_ leftText: LabelModel) {
+        self.leftText = leftText
+    }
 }
diff --git a/MVMCoreUI/Atoms/Views/MultiProgressModel.swift b/MVMCoreUI/Atoms/Views/MultiProgressModel.swift
index 6dd05b0b..4033fd28 100644
--- a/MVMCoreUI/Atoms/Views/MultiProgressModel.swift
+++ b/MVMCoreUI/Atoms/Views/MultiProgressModel.swift
@@ -26,6 +26,7 @@ import Foundation
     public var roundedRect: Bool?
     
     private enum CodingKeys: String, CodingKey {
+        case moleculeName
         case progressList
         case thickness
         case roundedRect
@@ -46,6 +47,7 @@ import Foundation
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(progressList, forKey: .progressList)
         try container.encodeIfPresent(thickness, forKey: .thickness)
         try container.encodeIfPresent(roundedRect, forKey: .roundedRect)
diff --git a/MVMCoreUI/Molecules/Doughnut/DoughnutChartModel.swift b/MVMCoreUI/Molecules/Doughnut/DoughnutChartModel.swift
index 42acd2f0..af6100ac 100644
--- a/MVMCoreUI/Molecules/Doughnut/DoughnutChartModel.swift
+++ b/MVMCoreUI/Molecules/Doughnut/DoughnutChartModel.swift
@@ -11,6 +11,7 @@ import Foundation
 @objcMembers public class DoughnutChartModel: MoleculeModelProtocol {
     public var backgroundColor: Color?
     public static var identifier: String = "doughnutChart"
+     public var moleculeName: String? = DoughnutChartModel.identifier
     public var title: LabelModel?
     public var subtitle: LabelModel?
     public var sections: [DoughnutChartItemModel]
@@ -24,6 +25,7 @@ import Foundation
 @objcMembers public class DoughnutChartItemModel: MoleculeModelProtocol {
     public var backgroundColor: Color?
     public static var identifier: String = "doughnutChartItem"
+    public var moleculeName: String? = DoughnutChartItemModel.identifier
     public var label: LabelModel
     @Percent public var percent: CGFloat
     public var color: Color
diff --git a/MVMCoreUI/Molecules/HorizontalCombinationViews/ImageHeadlineBodyModel.swift b/MVMCoreUI/Molecules/HorizontalCombinationViews/ImageHeadlineBodyModel.swift
index 4966ce58..7f3d52dc 100644
--- a/MVMCoreUI/Molecules/HorizontalCombinationViews/ImageHeadlineBodyModel.swift
+++ b/MVMCoreUI/Molecules/HorizontalCombinationViews/ImageHeadlineBodyModel.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct ImageHeadlineBodyModel: MoleculeModelProtocol {
     public static var identifier: String = "imageHeadlineBody"
+    public var moleculeName: String? = ImageHeadlineBodyModel.identifier
     public var backgroundColor: Color?
     public var image: ImageViewModel
     public var headlineBody: HeadlineBodyModel
diff --git a/MVMCoreUI/Molecules/Items/StackItemModel.swift b/MVMCoreUI/Molecules/Items/StackItemModel.swift
index 2058353c..b7d1a269 100644
--- a/MVMCoreUI/Molecules/Items/StackItemModel.swift
+++ b/MVMCoreUI/Molecules/Items/StackItemModel.swift
@@ -10,6 +10,7 @@ import Foundation
 
 @objcMembers public class StackItemModel: ContainerModel, StackItemModelProtocol, MoleculeModelProtocol {
     public static var identifier: String = "simpleStackItem"
+    public var moleculeName: String? = StackItemModel.identifier
     public var backgroundColor: Color?
     public var spacing: CGFloat?
     public var percent: Int?
diff --git a/MVMCoreUI/Molecules/LeftRightViews/ActionDetailWithImageModel.swift b/MVMCoreUI/Molecules/LeftRightViews/ActionDetailWithImageModel.swift
index a397c1a1..9dbf53c0 100644
--- a/MVMCoreUI/Molecules/LeftRightViews/ActionDetailWithImageModel.swift
+++ b/MVMCoreUI/Molecules/LeftRightViews/ActionDetailWithImageModel.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct ActionDetailWithImageModel: MoleculeModelProtocol {
     public static var identifier: String = "actionDetailWithImage"
+    public var moleculeName: String? = ActionDetailWithImageModel.identifier
     public var backgroundColor: Color?
     public var headlineBodyButton: HeadlineBodyButtonModel
     public var image: ImageViewModel
diff --git a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift
index 5ce04f9c..aad8ec06 100644
--- a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift
+++ b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift
@@ -9,6 +9,7 @@
 import Foundation
 public struct HeadlineBodyLinkToggleModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBodyLinkToggle"
+    public var moleculeName: String? = HeadlineBodyLinkToggleModel.identifier
     public var backgroundColor: Color?
     public var headlineBodyLink: HeadlineBodyLinkModel
     public var toggle: ToggleModel
diff --git a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyToggleModel.swift b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyToggleModel.swift
index dd7c2b1c..bb3391a6 100644
--- a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyToggleModel.swift
+++ b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyToggleModel.swift
@@ -11,6 +11,7 @@ import Foundation
 
 open class HeadlineBodyToggleModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBodyToggle"
+    public var moleculeName: String? = HeadlineBodyToggleModel.identifier
     open var backgroundColor: Color?
     open var headlineBody: HeadlineBodyModel
     open var toggle: ToggleModel
diff --git a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
index 7ed5857e..526ac6b9 100644
--- a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
+++ b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
@@ -10,7 +10,13 @@ import Foundation
 
 public class LabelToggleModel: MoleculeModelProtocol {
     public static var identifier: String = "labelToggle"
+    public var moleculeName: String? = LabelToggleModel.identifier
     public var backgroundColor: Color?
     public var label: LabelModel
     public var toggle: ToggleModel
+
+    init(_ label: LabelModel, _ toggle: ToggleModel) {
+        self.label = label
+        self.toggle = toggle
+    }
 }
diff --git a/MVMCoreUI/Molecules/ScrollerModel.swift b/MVMCoreUI/Molecules/ScrollerModel.swift
index f92fe13b..91dc2e1c 100644
--- a/MVMCoreUI/Molecules/ScrollerModel.swift
+++ b/MVMCoreUI/Molecules/ScrollerModel.swift
@@ -10,5 +10,6 @@ import UIKit
 
 public class ScrollerModel: MoleculeContainerModel, MoleculeModelProtocol {
     public static var identifier: String = "scroller"
+    public var moleculeName: String? = ScrollerModel.identifier
     public var backgroundColor: Color?
 }
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift
index e9341535..81a38111 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift
@@ -11,7 +11,7 @@ import Foundation
 struct EyebrowHeadlineBodyLinkModel: MoleculeModelProtocol {
     static var identifier: String = "eyebrowHeadlineBodyLink"
     var backgroundColor: Color?
-
+    var moleculeName: String? = EyebrowHeadlineBodyLinkModel.identifier
     public var eyeBrow: LabelModel?
     public var headline: LabelModel?
     public var body: LabelModel?
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyButtonModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyButtonModel.swift
index 74e85ea9..ec97fda0 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyButtonModel.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyButtonModel.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct HeadlineBodyButtonModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBodyButton"
+    public var moleculeName: String? = HeadlineBodyButtonModel.identifier
     public var backgroundColor: Color?
 
     public var headlineBody: HeadlineBodyModel
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift
index 9eae8e03..27f0d670 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct HeadlineBodyLinkModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBodyLink"
+    public var moleculeName: String? = HeadlineBodyLinkModel.identifier
     public var headlineBody: HeadlineBodyModel
     public var link: LinkModel
     public var backgroundColor: Color?
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
index fd5be23a..d7a08091 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
@@ -10,6 +10,7 @@ import Foundation
 
 @objcMembers public class HeadlineBodyModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBody"
+    public var moleculeName: String? = HeadlineBodyModel.identifier
     public var headline: LabelModel?
     public var body: LabelModel?
     public var style: String?