diff --git a/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabelModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabelModel.swift
index f5a65103..ca0acd79 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
-    @DecodableDefault.UUID public var id: String
+    @DecodableDefault.UUIDString public var id: String
     
     public var backgroundColor: Color?
     public var checkboxAlignment: CheckboxPosition?
diff --git a/MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift b/MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift
index 7f8fa7b6..5079fc93 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" }
-    @DecodableDefault.UUID public var id: String
+    @DecodableDefault.UUIDString 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 91aef2a9..2f442dc8 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
-    @DecodableDefault.UUID public var id: String
+    @DecodableDefault.UUIDString public var id: String
     
     public var backgroundColor: Color?
     public var leftText: LabelModel
diff --git a/MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartItemModel.swift b/MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartItemModel.swift
index ce2e4fac..7ac68d0a 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
-    @DecodableDefault.UUID public var id: String
+    @DecodableDefault.UUIDString 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 4dbcb4bb..3333ae77 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
-    @DecodableDefault.UUID public var id: String
+    @DecodableDefault.UUIDString 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 04aeb0fa..84518c8c 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
-    @DecodableDefault.UUID public var id: String
+    @DecodableDefault.UUIDString 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 7839bcdc..571848dc 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"
-    @DecodableDefault.UUID public var id: String
+    @DecodableDefault.UUIDString public var id: String
     
     public var backgroundColor: Color?
     public var moleculeName: String = RadioButtonLabelModel.identifier
diff --git a/MVMCoreUI/Atomic/Molecules/LeftRightViews/ActionDetailWithImageModel.swift b/MVMCoreUI/Atomic/Molecules/LeftRightViews/ActionDetailWithImageModel.swift
index 99ef07fd..2e7b7500 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
-    @DecodableDefault.UUID public var id: String
+    @DecodableDefault.UUIDString public var id: String
     
     public var backgroundColor: Color?
     public var headlineBodyButton: HeadlineBodyButtonModel
diff --git a/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift b/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift
index 0783d542..84a03adf 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
-    @DecodableDefault.UUID public var id: String
+    @DecodableDefault.UUIDString 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 419097aa..4c86ed76 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
-    @DecodableDefault.UUID public var id: String
+    @DecodableDefault.UUIDString public var id: String
     open var backgroundColor: Color?
     open var headlineBody: HeadlineBodyModel
     open var toggle: ToggleModel
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift
index a715f7f7..6c2113bf 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
-    @DecodableDefault.UUID public var id: String
+    @DecodableDefault.UUIDString public var id: String
     
     public var headlineBody: HeadlineBodyModel
     public var link: LinkModel