diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift b/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
index b3c23e87..08afefde 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
@@ -18,7 +18,7 @@ open class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWat
     //--------------------------------------------------
     //Making static property as class property so that subclasses can override getter function of the property
     open class var identifier: String { "button" }
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var accessibilityIdentifier: String?
     public var accessibilityText: String?
diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/CaretLinkModel.swift b/MVMCoreUI/Atomic/Atoms/Buttons/CaretLinkModel.swift
index 399219cb..3a5429e1 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/CaretLinkModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/CaretLinkModel.swift
@@ -16,7 +16,7 @@ public class CaretLinkModel: ButtonModelProtocol, MoleculeModelProtocol, Enablea
     //--------------------------------------------------
     
     public static var identifier: String = "caretLink"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     public var backgroundColor: Color?
     public var accessibilityIdentifier: String?
     public var title: String
diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/ImageButtonModel.swift b/MVMCoreUI/Atomic/Atoms/Buttons/ImageButtonModel.swift
index df24270d..a61ec150 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/ImageButtonModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/ImageButtonModel.swift
@@ -14,7 +14,7 @@ open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGro
     //--------------------------------------------------
     
     public static var identifier: String = "imageButton"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var image: ImageViewModel?
@@ -54,6 +54,7 @@ open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGro
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         
+        id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         image = try typeContainer.decodeIfPresent(ImageViewModel.self, forKey: .image)
         accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
@@ -79,6 +80,7 @@ open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGro
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(image, forKey: .image)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/Link/LinkModel.swift b/MVMCoreUI/Atomic/Atoms/Buttons/Link/LinkModel.swift
index 5b290d6e..62ba0422 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/Link/LinkModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/Link/LinkModel.swift
@@ -15,7 +15,7 @@ open class LinkModel: ButtonModelProtocol, MoleculeModelProtocol, EnableableMode
     //--------------------------------------------------
     
     public class var identifier: String { "link" }
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var accessibilityIdentifier: String?
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/Tags/TagModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/Tags/TagModel.swift
index d7148baa..40cb98b7 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/Tags/TagModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/Tags/TagModel.swift
@@ -11,7 +11,7 @@ import MVMCore
 
 @objcMembers public class TagModel: MoleculeModelProtocol {
     public static var identifier: String = "tag"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var label: LabelModel
     public var action: ActionModelProtocol?
@@ -41,6 +41,7 @@ import MVMCore
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
         label = try typeContainer.decode(LabelModel.self, forKey: .label)
         action = try typeContainer.decodeModelIfPresent(codingKey: .action)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
@@ -48,6 +49,7 @@ import MVMCore
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(label, forKey: .label)
         try container.encodeModelIfPresent(action, forKey: .action)
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/Tags/TagsModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/Tags/TagsModel.swift
index 24adcc43..22ce1d9a 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/Tags/TagsModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/Tags/TagsModel.swift
@@ -11,7 +11,7 @@ import MVMCore
 
 @objcMembers public class TagsModel: MoleculeModelProtocol {
     public static var identifier: String = "tags"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var tags: [TagModel]
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift
index 92ad5c53..6f58cf64 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift
@@ -16,7 +16,7 @@ import Foundation
     //--------------------------------------------------
     
     public class var identifier: String { "" }
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var accessibilityIdentifier: String?
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift
index 6f30282e..604a8a8d 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift
@@ -20,7 +20,7 @@
     //--------------------------------------------------
     
     public static var identifier: String = "checkbox"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     public var backgroundColor: Color?
     public var accessibilityIdentifier: String?
     public var selected: Bool = false
@@ -109,6 +109,8 @@
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         
+        id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        
         accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         
         if let borderWidth = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .borderWidth) {
@@ -182,6 +184,7 @@
 
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(groupName, forKey: .groupName)
         try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/HeartModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/HeartModel.swift
index 7580e6e0..cb301e22 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/HeartModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/HeartModel.swift
@@ -14,7 +14,7 @@ open class HeartModel: MoleculeModelProtocol, EnableableModelProtocol {
     //--------------------------------------------------
     
     public static var identifier: String = "heart"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var accessibilityIdentifier: String?
@@ -80,6 +80,7 @@ open class HeartModel: MoleculeModelProtocol, EnableableModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
+        try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(isActive, forKey: .isActive)
         try container.encode(activeColor, forKey: .activeColor)
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxModel.swift
index cf592ecb..acec6e83 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxModel.swift
@@ -13,7 +13,7 @@ import MVMCore
     //--------------------------------------------------
     
     public static var identifier: String = "radioBox"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var text: String
     public var subText: String?
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift
index f4f538d6..f1c652f7 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift
@@ -13,7 +13,7 @@ import MVMCore
     //--------------------------------------------------
     
     public static var identifier: String = "radioBoxes"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var boxes: [RadioBoxModel]
     public var backgroundColor: Color?
@@ -78,6 +78,7 @@ import MVMCore
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
         selectedAccentColor = try typeContainer.decodeIfPresent(Color.self, forKey: .selectedAccentColor)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
@@ -94,6 +95,7 @@ import MVMCore
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(boxes, forKey: .boxes)
         try container.encodeIfPresent(selectedAccentColor, forKey: .selectedAccentColor)
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonModel.swift
index 497a0b1c..99b5cdb7 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonModel.swift
@@ -15,7 +15,7 @@ open class RadioButtonModel: MoleculeModelProtocol, FormFieldProtocol {
     //--------------------------------------------------
     
     public static var identifier: String = "radioButton"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var accessibilityIdentifier: String?
@@ -110,6 +110,7 @@ open class RadioButtonModel: MoleculeModelProtocol, FormFieldProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
+        try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(state, forKey: .state)
         try container.encode(enabled, forKey: .enabled)
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchModel.swift
index 1f47abc4..91f13b48 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchModel.swift
@@ -13,7 +13,7 @@ import MVMCore
     //--------------------------------------------------
     
     public static var identifier: String = "radioSwatch"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var accessibilityIdentifier: String?
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchesModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchesModel.swift
index 9a154167..f424593b 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchesModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchesModel.swift
@@ -13,7 +13,7 @@ import MVMCore
     //--------------------------------------------------
     
     public static var identifier: String = "radioSwatches"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var accessibilityIdentifier: String?
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift
index 3973f0bc..429a5769 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift
@@ -13,7 +13,7 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
     //--------------------------------------------------
     
     public static var identifier: String = "toggle"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var accessibilityIdentifier: String?
     public var backgroundColor: Color?
diff --git a/MVMCoreUI/Atomic/Atoms/Views/ArrowModel.swift b/MVMCoreUI/Atomic/Atoms/Views/ArrowModel.swift
index 05b54373..7697143e 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/ArrowModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/ArrowModel.swift
@@ -18,7 +18,7 @@ open class ArrowModel: MoleculeModelProtocol, EnableableModelProtocol {
         return "arrow"
     }
     public var moleculeName: String?
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var disabledColor: Color = Color(uiColor: .mvmCoolGray3)
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CaretViewModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CaretViewModel.swift
index a5ebc86d..380328d5 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CaretViewModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CaretViewModel.swift
@@ -15,7 +15,7 @@ import MVMCore
     //--------------------------------------------------
     
     public static var identifier: String = "caretView"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     public var backgroundColor: Color?
     public var strokeColor: Color = Color(uiColor: .mvmBlack)
     public var strokeColor_inverted: Color = Color(uiColor: .mvmWhite)
@@ -53,6 +53,8 @@ import MVMCore
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         
+        id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        
         if let strokeColor = try typeContainer.decodeIfPresent(Color.self, forKey: .strokeColor) {
             self.strokeColor = strokeColor
         }
@@ -80,6 +82,7 @@ import MVMCore
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(strokeColor, forKey: .strokeColor)
         try container.encode(strokeColor_inverted, forKey: .strokeColor_inverted)
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicatorModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicatorModel.swift
index d1d762c1..f5c0adeb 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicatorModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicatorModel.swift
@@ -18,7 +18,7 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
         return ""
     }
     
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     public var backgroundColor: Color?
     public var moleculeName: String?
     public var numberOfPages: Int = 0
@@ -68,6 +68,7 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
         moleculeName = try typeContainer.decodeIfPresent(String.self, forKey: .moleculeName)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         
@@ -114,6 +115,7 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
         try container.encodeIfPresent(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encode(numberOfPages, forKey: .numberOfPages)
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabelModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabelModel.swift
index 11252461..f5a65103 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabelModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabelModel.swift
@@ -18,7 +18,7 @@ public enum CheckboxPosition: String, Codable {
 @objcMembers open class CheckboxLabelModel: MoleculeModelProtocol {
     open class var identifier: String { "checkboxLabel" }
     public var moleculeName: String = CheckboxLabelModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    @DecodableDefault.UUID public var id: String
     
     public var backgroundColor: Color?
     public var checkboxAlignment: CheckboxPosition?
diff --git a/MVMCoreUI/Atomic/Atoms/Views/DashLineModel.swift b/MVMCoreUI/Atomic/Atoms/Views/DashLineModel.swift
index 30864afc..8e533fde 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/DashLineModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/DashLineModel.swift
@@ -15,7 +15,7 @@ import MVMCore
     //--------------------------------------------------
     
     public static var identifier: String = "dashLine"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var accessibilityIdentifier: String?
diff --git a/MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift b/MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift
index 4c37a2d8..7f8fa7b6 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift
@@ -13,7 +13,7 @@
     //--------------------------------------------------
     
     open class var identifier: String { "image" }
-    public var id: String = { return UUID().uuidString }()
+    @DecodableDefault.UUID public var id: String
     
     public var backgroundColor: Color?
     public var moleculeName: String = ImageViewModel.identifier
diff --git a/MVMCoreUI/Atomic/Atoms/Views/LeftRightLabelModel.swift b/MVMCoreUI/Atomic/Atoms/Views/LeftRightLabelModel.swift
index 1574567a..91aef2a9 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/LeftRightLabelModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/LeftRightLabelModel.swift
@@ -15,7 +15,7 @@ import UIKit
 
     public static var identifier: String = "leftRightLabelView"
     public var moleculeName: String = LeftRightLabelModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    @DecodableDefault.UUID public var id: String
     
     public var backgroundColor: Color?
     public var leftText: LabelModel
diff --git a/MVMCoreUI/Atomic/Atoms/Views/LineModel.swift b/MVMCoreUI/Atomic/Atoms/Views/LineModel.swift
index 4850ac21..3b4c57e9 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/LineModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/LineModel.swift
@@ -53,7 +53,7 @@ import VDSColorTokens
     //--------------------------------------------------
     
     public static var identifier: String = "line"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var type: Style = .secondary
     public var frequency: Frequency? = .allExceptTop
diff --git a/MVMCoreUI/Atomic/Atoms/Views/LoadingSpinnerModel.swift b/MVMCoreUI/Atomic/Atoms/Views/LoadingSpinnerModel.swift
index 064d6c38..b74807fb 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/LoadingSpinnerModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/LoadingSpinnerModel.swift
@@ -14,7 +14,7 @@ open class LoadingSpinnerModel: MoleculeModelProtocol {
     // MARK: - Properties
     //--------------------------------------------------
     public static var identifier: String = "loadingSpinner"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var strokeColor = Color(uiColor: .mvmBlack)
diff --git a/MVMCoreUI/Atomic/Atoms/Views/MultiProgressModel.swift b/MVMCoreUI/Atomic/Atoms/Views/MultiProgressModel.swift
index cadee43d..d664afa6 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/MultiProgressModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/MultiProgressModel.swift
@@ -21,7 +21,7 @@ import Foundation
 @objcMembers public class MultiProgressBarModel: MoleculeModelProtocol {
     
     public static var identifier: String = "multiProgressBar"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var progressList: [SingleProgressBarModel]
     public var backgroundColor: Color?
diff --git a/MVMCoreUI/Atomic/Atoms/Views/ProgressBarModel.swift b/MVMCoreUI/Atomic/Atoms/Views/ProgressBarModel.swift
index fd24858e..439fad3d 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/ProgressBarModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/ProgressBarModel.swift
@@ -10,7 +10,7 @@ import Foundation
 
 @objcMembers public class ProgressBarModel: MoleculeModelProtocol {
     public static var identifier: String = "progressBar"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     @Percent public var percent: CGFloat
     public var color: Color = Color(uiColor: .mfCerulean())
diff --git a/MVMCoreUI/Atomic/Atoms/Views/StarModel.swift b/MVMCoreUI/Atomic/Atoms/Views/StarModel.swift
index 520425f7..7b427cde 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/StarModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/StarModel.swift
@@ -13,7 +13,7 @@ open class StarModel: MoleculeModelProtocol {
     // MARK: - Properties
     //--------------------------------------------------
     public static var identifier: String = "star"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     @Percent public var percent: CGFloat = 0
diff --git a/MVMCoreUI/Atomic/Atoms/Views/StarsModel.swift b/MVMCoreUI/Atomic/Atoms/Views/StarsModel.swift
index a2d04d66..10e6400a 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/StarsModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/StarsModel.swift
@@ -13,7 +13,7 @@ import MVMCore
     // MARK: - Properties
     //--------------------------------------------------
     public static var identifier: String = "stars"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var starBackgroundColor: Color?
@@ -52,6 +52,7 @@ import MVMCore
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         
+        id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
         stars = try typeContainer.decode([StarModel].self, forKey: .stars)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         starBackgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .starBackgroundColor)
@@ -67,6 +68,7 @@ import MVMCore
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(stars, forKey: .stars)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
diff --git a/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift b/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift
index a7e09cb2..b41d9eef 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift
@@ -15,7 +15,7 @@ open class TileletModel: MoleculeModelProtocol {
     // MARK: - Properties
     //--------------------------------------------------
     public static var identifier: String = "tilelet"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     public var backgroundColor: Color?
     public var color: TileContainer.BackgroundColor
     public var padding: TileContainer.Padding
@@ -31,6 +31,7 @@ open class TileletModel: MoleculeModelProtocol {
     public var action: ActionModelProtocol?
     
     private enum CodingKeys: String, CodingKey {
+        case id
         case moleculeName
         case backgroundColor
         case color
@@ -48,6 +49,7 @@ open class TileletModel: MoleculeModelProtocol {
     }
     required public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
         self.backgroundColor = try container.decodeIfPresent(Color.self, forKey: .backgroundColor)
         self.color = try container.decodeIfPresent(TileContainer.BackgroundColor.self, forKey: .color) ?? TileContainer.BackgroundColor.black
         self.padding = try container.decodeIfPresent(TileContainer.Padding.self, forKey: .padding) ?? TileContainer.Padding.padding4X
@@ -87,6 +89,7 @@ open class TileletModel: MoleculeModelProtocol {
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(color, forKey: .color)
diff --git a/MVMCoreUI/Atomic/Atoms/Views/Video/VideoModel.swift b/MVMCoreUI/Atomic/Atoms/Views/Video/VideoModel.swift
index b34cc7aa..27567926 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Video/VideoModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Video/VideoModel.swift
@@ -10,7 +10,7 @@ import Foundation
 
 open class VideoModel: MoleculeModelProtocol, PageBehaviorProtocolRequirer {
     public static var identifier = "video"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     public var backgroundColor: Color?
     public var video: String
     public var showControls = false
@@ -59,6 +59,7 @@ open class VideoModel: MoleculeModelProtocol, PageBehaviorProtocolRequirer {
 
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
         video = try typeContainer.decode(String.self, forKey:.video)
         if let showControls = try typeContainer.decodeIfPresent(Bool.self, forKey: .showControls) {
             self.showControls = showControls
@@ -74,6 +75,7 @@ open class VideoModel: MoleculeModelProtocol, PageBehaviorProtocolRequirer {
 
     open func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(video, forKey: .video)
         try container.encode(showControls, forKey: .showControls)
diff --git a/MVMCoreUI/Atomic/Atoms/Views/WebViewModel.swift b/MVMCoreUI/Atomic/Atoms/Views/WebViewModel.swift
index e953e2ab..28d619a8 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/WebViewModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/WebViewModel.swift
@@ -12,7 +12,7 @@ import MVMCore
 @objcMembers public class WebViewModel: MoleculeModelProtocol {
     public static var identifier: String = "webview"
     public var moleculeName: String = WebViewModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var url: URL?
diff --git a/MVMCoreUI/Atomic/Atoms/Views/WheelModel.swift b/MVMCoreUI/Atomic/Atoms/Views/WheelModel.swift
index 32284277..4fed14cb 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/WheelModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/WheelModel.swift
@@ -19,7 +19,7 @@ public enum GraphStyle: String, Codable {
 public class WheelModel: MoleculeModelProtocol {
     
     public static var identifier: String = "wheel"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var style: GraphStyle = .unlimited {
         didSet {
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockUpsPlanNamesModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockUpsPlanNamesModel.swift
index 5a172208..acbf276d 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockUpsPlanNamesModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockUpsPlanNamesModel.swift
@@ -13,7 +13,7 @@ public class LockUpsPlanNamesModel: MoleculeModelProtocol {
     // MARK: - Properties
     //--------------------------------------------------
     public static var identifier: String = "planNamesLockup"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var headline: LabelModel
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockupsPlanSMLXLModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockupsPlanSMLXLModel.swift
index ee684645..3e1c1bcc 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockupsPlanSMLXLModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockupsPlanSMLXLModel.swift
@@ -14,7 +14,7 @@ public class LockupsPlanSMLXLModel: MoleculeModelProtocol {
     //--------------------------------------------------
     
     public static var identifier: String = "planLockup"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var planLabel : LabelModel
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/TitleLockupModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/TitleLockupModel.swift
index 9e55db1b..89d32ca9 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/TitleLockupModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/TitleLockupModel.swift
@@ -16,7 +16,7 @@ public class TitleLockupModel: MoleculeModelProtocol, ParentMoleculeModelProtoco
     
     public static var identifier: String = "titleLockup"
     public var moleculeName: String = TitleLockupModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var eyebrow: LabelModel?
     public var title: LabelModel
diff --git a/MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartItemModel.swift b/MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartItemModel.swift
index 187fc8a5..ce2e4fac 100644
--- a/MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartItemModel.swift
@@ -16,7 +16,7 @@ import Foundation
     
     public static var identifier: String = "doughnutChartItem"
     public var moleculeName: String = DoughnutChartItemModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    @DecodableDefault.UUID public var id: String
     
     public var backgroundColor: Color?
     public var label: LabelModel
diff --git a/MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartModel.swift b/MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartModel.swift
index 07d7756f..4dbcb4bb 100644
--- a/MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartModel.swift
@@ -16,7 +16,7 @@ import Foundation
     
     public static var identifier: String = "doughnutChart"
     public var moleculeName: String = DoughnutChartModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    @DecodableDefault.UUID public var id: String
     
     public var backgroundColor: Color?
     public var title: LabelModel?
diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/ImageHeadlineBodyModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/ImageHeadlineBodyModel.swift
index 08fe6db3..04aeb0fa 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/ImageHeadlineBodyModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/ImageHeadlineBodyModel.swift
@@ -15,7 +15,7 @@ public class ImageHeadlineBodyModel: MoleculeModelProtocol {
     
     public static var identifier: String = "imageHeadlineBody"
     public var moleculeName: String = ImageHeadlineBodyModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    @DecodableDefault.UUID public var id: String
     
     public var backgroundColor: Color?
     public var image: ImageViewModel
diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/RadioButtonLabelModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/RadioButtonLabelModel.swift
index ea574220..7839bcdc 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/RadioButtonLabelModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/RadioButtonLabelModel.swift
@@ -15,7 +15,7 @@ import MVMCore
     //--------------------------------------------------
 
     public static var identifier: String = "radioButtonLabel"
-    public var id: String = { return UUID().uuidString }()
+    @DecodableDefault.UUID public var id: String
     
     public var backgroundColor: Color?
     public var moleculeName: String = RadioButtonLabelModel.identifier
diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
index a40d303f..b984a9da 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
@@ -11,7 +11,7 @@ import VDSColorTokens
 
 open class TabBarModel: MoleculeModelProtocol {
     public static var identifier: String = "tabBar"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     open var tabs: [TabBarItemModel]
     
diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift
index e938c119..3671e5e1 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift
@@ -11,7 +11,7 @@ import VDSColorTokens
 
 open class TabsModel: MoleculeModelProtocol {
     public static var identifier: String = "tabs"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     open var tabs: [TabItemModel]
     
diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonViewModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonViewModel.swift
index 3f7eeba8..b5d07c4a 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonViewModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonViewModel.swift
@@ -15,7 +15,7 @@ public class TwoButtonViewModel: ParentMoleculeModelProtocol {
     //--------------------------------------------------
     
     public static var identifier: String = "twoButtonView"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     public var backgroundColor: Color?
     public var primaryButton: ButtonModel?
     public var secondaryButton: ButtonModel?
@@ -29,6 +29,7 @@ public class TwoButtonViewModel: ParentMoleculeModelProtocol {
     //--------------------------------------------------
     
     private enum CodingKeys: String, CodingKey {
+        case id
         case moleculeName
         case backgroundColor
         case primaryButton
@@ -50,6 +51,7 @@ public class TwoButtonViewModel: ParentMoleculeModelProtocol {
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         
         //set context value for 'primary' style to be set for the primaryButton in case the
@@ -67,6 +69,7 @@ public class TwoButtonViewModel: ParentMoleculeModelProtocol {
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(primaryButton, forKey: .primaryButton)
diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoLinkViewModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoLinkViewModel.swift
index 089e1160..c9ae177b 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoLinkViewModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoLinkViewModel.swift
@@ -10,7 +10,7 @@ import Foundation
 
 public class TwoLinkViewModel: MoleculeModelProtocol {
     public static var identifier: String = "twoLinkView"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var rightLink: LinkModel?
diff --git a/MVMCoreUI/Atomic/Molecules/LeftRightViews/ActionDetailWithImageModel.swift b/MVMCoreUI/Atomic/Molecules/LeftRightViews/ActionDetailWithImageModel.swift
index cb237b05..99ef07fd 100644
--- a/MVMCoreUI/Atomic/Molecules/LeftRightViews/ActionDetailWithImageModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/LeftRightViews/ActionDetailWithImageModel.swift
@@ -11,7 +11,7 @@ import Foundation
 public class ActionDetailWithImageModel: MoleculeModelProtocol {
     public static var identifier: String = "actionDetailWithImage"
     public var moleculeName: String = ActionDetailWithImageModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    @DecodableDefault.UUID public var id: String
     
     public var backgroundColor: Color?
     public var headlineBodyButton: HeadlineBodyButtonModel
diff --git a/MVMCoreUI/Atomic/Molecules/LeftRightViews/CornerLabelsModel.swift b/MVMCoreUI/Atomic/Molecules/LeftRightViews/CornerLabelsModel.swift
index 88a42067..dc8f2396 100644
--- a/MVMCoreUI/Atomic/Molecules/LeftRightViews/CornerLabelsModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/LeftRightViews/CornerLabelsModel.swift
@@ -11,7 +11,7 @@ import MVMCore
 
 public class CornerLabelsModel: ParentMoleculeModelProtocol {
     public static var identifier: String = "cornerLabels"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     public var backgroundColor: Color?
     public var topLeftLabel: LabelModel?
     public var topRightLabel: LabelModel?
@@ -27,6 +27,7 @@ public class CornerLabelsModel: ParentMoleculeModelProtocol {
     }
     
     private enum CodingKeys: String, CodingKey {
+        case id
         case backgroundColor
         case topLeftLabel
         case topRightLabel
@@ -38,6 +39,7 @@ public class CornerLabelsModel: ParentMoleculeModelProtocol {
 
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         molecule = try typeContainer.decodeModelIfPresent(codingKey: .molecule)
         topLeftLabel = try typeContainer.decodeMoleculeIfPresent(codingKey: .topLeftLabel)
@@ -48,6 +50,7 @@ public class CornerLabelsModel: ParentMoleculeModelProtocol {
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeModelIfPresent(molecule, forKey: .molecule)
         try container.encodeModelIfPresent(topLeftLabel, forKey: .topLeftLabel)
diff --git a/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift b/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift
index 15d9c78c..0783d542 100644
--- a/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift
@@ -10,7 +10,7 @@ import Foundation
 public class HeadlineBodyLinkToggleModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBodyLinkToggle"
     public var moleculeName: String = HeadlineBodyLinkToggleModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    @DecodableDefault.UUID public var id: String
     public var backgroundColor: Color?
     public var headlineBodyLink: HeadlineBodyLinkModel
     public var toggle: ToggleModel
diff --git a/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyToggleModel.swift b/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyToggleModel.swift
index fffd53f7..419097aa 100644
--- a/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyToggleModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyToggleModel.swift
@@ -12,7 +12,7 @@ import Foundation
 open class HeadlineBodyToggleModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBodyToggle"
     public var moleculeName: String = HeadlineBodyToggleModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    @DecodableDefault.UUID public var id: String
     open var backgroundColor: Color?
     open var headlineBody: HeadlineBodyModel
     open var toggle: ToggleModel
diff --git a/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift b/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
index 845296dd..fe8cc16a 100644
--- a/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
@@ -12,7 +12,7 @@ import MVMCore
 public class LabelToggleModel: MoleculeModelProtocol {
     public static var identifier: String = "labelToggle"
     public var moleculeName: String = LabelToggleModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var label: LabelModel
diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift
index 0c702899..ab1c993e 100644
--- a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift
@@ -14,7 +14,7 @@ public class NavigationImageButtonModel: NavigationButtonModelProtocol, Molecule
     //--------------------------------------------------
     
     public static var identifier: String = "navigationImageButton"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var accessibilityIdentifier: String?
@@ -52,6 +52,7 @@ public class NavigationImageButtonModel: NavigationButtonModelProtocol, Molecule
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
         accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         image = try typeContainer.decode(String.self, forKey: .image)
         action = try typeContainer.decodeModel(codingKey: .action)
diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift
index f8152d20..33529e77 100644
--- a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift
@@ -13,7 +13,7 @@ open class NavigationLabelButtonModel: NavigationButtonModelProtocol, MoleculeMo
     //--------------------------------------------------
     
     open class var identifier: String { "navigationLabelButton" }
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     open var backgroundColor: Color?
     open var accessibilityIdentifier: String?
diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
index 025e9dd4..d39cdeaf 100644
--- a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
@@ -19,7 +19,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
     //--------------------------------------------------
     
     open class var identifier: String { "navigationBar" }
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     private let defaultHidesSystemBackButton = true
     
diff --git a/MVMCoreUI/Atomic/Molecules/OtherContainers/ModuleMoleculeModel.swift b/MVMCoreUI/Atomic/Molecules/OtherContainers/ModuleMoleculeModel.swift
index 0c499c1b..b34922db 100644
--- a/MVMCoreUI/Atomic/Molecules/OtherContainers/ModuleMoleculeModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/OtherContainers/ModuleMoleculeModel.swift
@@ -11,7 +11,7 @@ import Foundation
 open class ModuleMoleculeModel: MoleculeModelProtocol {
     
     public static var identifier: String = "moduleMolecule"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var moduleName: String
diff --git a/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationXButtonModel.swift b/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationXButtonModel.swift
index 02f55d83..ac1c8905 100644
--- a/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationXButtonModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationXButtonModel.swift
@@ -12,7 +12,7 @@ import MVMCore
 public class NotificationXButtonModel: ButtonModelProtocol, MoleculeModelProtocol {
     
     public static var identifier: String = "notificationXButton"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var color: Color?
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift
index 56378b13..0d46916e 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift
@@ -13,7 +13,7 @@ public class EyebrowHeadlineBodyLinkModel: MoleculeModelProtocol, ParentMolecule
     //--------------------------------------------------
     
     public static var identifier: String = "eyebrowHeadlineBodyLink"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     public var moleculeName: String = EyebrowHeadlineBodyLinkModel.identifier
     public var backgroundColor: Color?
     public var eyebrow: LabelModel?
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyButtonModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyButtonModel.swift
index 346d7ce3..1b713720 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyButtonModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyButtonModel.swift
@@ -14,7 +14,7 @@ public class HeadlineBodyButtonModel: MoleculeModelProtocol {
     
     public static var identifier: String = "headlineBodyButton"
     public var moleculeName: String = HeadlineBodyButtonModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift
index edca0398..a715f7f7 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift
@@ -16,7 +16,7 @@ public class HeadlineBodyLinkModel: MoleculeModelProtocol {
     
     public static var identifier: String = "headlineBodyLink"
     public var moleculeName: String = HeadlineBodyLinkModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    @DecodableDefault.UUID public var id: String
     
     public var headlineBody: HeadlineBodyModel
     public var link: LinkModel
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
index ecdeed40..a3eaf918 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
@@ -14,7 +14,7 @@
     
     public static var identifier: String = "headlineBody"
     public var moleculeName: String = HeadlineBodyModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     public var headline: LabelModel?
     public var body: LabelModel?
     public var style: Style?
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift
index 808a1469..8ffc24e4 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift
@@ -13,7 +13,7 @@ public class StringAndMoleculeModel: MoleculeModelProtocol {
     //--------------------------------------------------
     
     public static var identifier: String = "stringAndMoleculeModel"
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var string: String
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLinkModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLinkModel.swift
index 564834ac..8f413429 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLinkModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLinkModel.swift
@@ -16,7 +16,7 @@ public class ThreeHeadlineBodyLinkModel: MoleculeModelProtocol {
     
     public static var identifier: String = "threeHeadlineBodyLink"
     public var moleculeName: String = ThreeHeadlineBodyLinkModel.identifier
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     
diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/CarouselModel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/CarouselModel.swift
index 0521aebd..5bfd8d0f 100644
--- a/MVMCoreUI/Atomic/Organisms/Carousel/CarouselModel.swift
+++ b/MVMCoreUI/Atomic/Organisms/Carousel/CarouselModel.swift
@@ -19,7 +19,7 @@ import UIKit
         return "carousel"
     }
     
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var backgroundColor: Color?
     public var molecules: [MoleculeModelProtocol & CarouselItemModelProtocol]
diff --git a/MVMCoreUI/Atomic/Organisms/StackModel.swift b/MVMCoreUI/Atomic/Organisms/StackModel.swift
index 6310fcea..da6c067e 100644
--- a/MVMCoreUI/Atomic/Organisms/StackModel.swift
+++ b/MVMCoreUI/Atomic/Organisms/StackModel.swift
@@ -25,6 +25,15 @@
         return molecules
     }
     
+    public func replaceChildMolecule(with replacementMolecule: MoleculeModelProtocol) -> Bool {
+        guard let replacementMolecule = replacementMolecule as? StackItemModelProtocol & MoleculeModelProtocol else { return false }
+        guard let matchingIndex = molecules.firstIndex(where: { molecule in
+            molecule.id == replacementMolecule.id
+        }) else { return false }
+        molecules[matchingIndex] = replacementMolecule
+        return true
+    }
+    
     //--------------------------------------------------
     // MARK: - Initializer
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Protocols/ModelProtocols/ParentMoleculeModelProtocol.swift b/MVMCoreUI/Atomic/Protocols/ModelProtocols/ParentMoleculeModelProtocol.swift
index 5f2905aa..78377a25 100644
--- a/MVMCoreUI/Atomic/Protocols/ModelProtocols/ParentMoleculeModelProtocol.swift
+++ b/MVMCoreUI/Atomic/Protocols/ModelProtocols/ParentMoleculeModelProtocol.swift
@@ -68,4 +68,12 @@ public extension ParentMoleculeModelProtocol {
         }
         return false
     }
+    
+    func replaceChildMolecule<P: ParentMoleculeModelProtocol, T: MoleculeModelProtocol>(on target: P, keyPath: ReferenceWritableKeyPath<P, T>, replacementMolecule: MoleculeModelProtocol) -> Bool {
+        if target[keyPath: keyPath].id == replacementMolecule.id, let newHeadline = replacementMolecule as? T {
+            target[keyPath: keyPath] = newHeadline
+            return true
+        }
+        return false
+    }
 }
diff --git a/MVMCoreUI/Containers/Views/ContainerModel.swift b/MVMCoreUI/Containers/Views/ContainerModel.swift
index c99cb5fd..b54590dd 100644
--- a/MVMCoreUI/Containers/Views/ContainerModel.swift
+++ b/MVMCoreUI/Containers/Views/ContainerModel.swift
@@ -13,7 +13,7 @@ open class ContainerModel: ContainerModelProtocol, Codable {
     // MARK: - Properties
     //--------------------------------------------------
     
-    public var id: String = { return UUID().uuidString }()
+    public var id: String = UUID().uuidString
     
     public var horizontalAlignment: UIStackView.Alignment?
     public var useHorizontalMargins: Bool?