diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 1497d632..6580f328 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -93,7 +93,7 @@
 		944589212385D6E900DE9FD4 /* DashLineModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944589202385D6E900DE9FD4 /* DashLineModel.swift */; };
 		944589232385DA9600DE9FD4 /* ImageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944589222385DA9500DE9FD4 /* ImageViewModel.swift */; };
 		9455B19C234F8A0400A574DB /* MVMAnimationFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9455B19B234F8A0400A574DB /* MVMAnimationFramework.framework */; };
-		946EE1BA237B66D80036751F /* ModelHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946EE1B9237B66D80036751F /* ModelHelper.swift */; };
+		946EE1BA237B66D80036751F /* MoleculeModelHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946EE1B9237B66D80036751F /* MoleculeModelHelper.swift */; };
 		948DB67E2326DCD90011F916 /* MultiProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 948DB67D2326DCD90011F916 /* MultiProgress.swift */; };
 		94C2D9842386F3F80006CF46 /* LabelAttributeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94C2D9832386F3F80006CF46 /* LabelAttributeModel.swift */; };
 		94C2D9A123872BCC0006CF46 /* LabelAttributeUnderlineModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94C2D9A023872BCC0006CF46 /* LabelAttributeUnderlineModel.swift */; };
@@ -364,7 +364,7 @@
 		944589202385D6E900DE9FD4 /* DashLineModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashLineModel.swift; sourceTree = "<group>"; };
 		944589222385DA9500DE9FD4 /* ImageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageViewModel.swift; sourceTree = "<group>"; };
 		9455B19B234F8A0400A574DB /* MVMAnimationFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MVMAnimationFramework.framework; path = ../SharedFrameworks/MVMAnimationFramework.framework; sourceTree = "<group>"; };
-		946EE1B9237B66D80036751F /* ModelHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelHelper.swift; sourceTree = "<group>"; };
+		946EE1B9237B66D80036751F /* MoleculeModelHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeModelHelper.swift; sourceTree = "<group>"; };
 		948DB67D2326DCD90011F916 /* MultiProgress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiProgress.swift; sourceTree = "<group>"; };
 		94C2D9832386F3F80006CF46 /* LabelAttributeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelAttributeModel.swift; sourceTree = "<group>"; };
 		94C2D9A023872BCC0006CF46 /* LabelAttributeUnderlineModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelAttributeUnderlineModel.swift; sourceTree = "<group>"; };
@@ -684,7 +684,7 @@
 		946EE1B5237B663A0036751F /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
-				946EE1B9237B66D80036751F /* ModelHelper.swift */,
+				946EE1B9237B66D80036751F /* MoleculeModelHelper.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -1561,7 +1561,6 @@
 				012A889C23889E8400FE3DA1 /* TemplateModelProtocol.swift in Sources */,
 				D29770FC21F7C77400B2F0D0 /* MVMCoreUITextFieldView.m in Sources */,
 				C003506123AA94CD00B6AC29 /* Button.swift in Sources */,
-				D29DF25121E6A177003B2FB9 /* MFDigitTextBox.m in Sources */,
 				DBC4391B224421A0001AB423 /* CaretButton.swift in Sources */,
 				0198F7A82256A80B0066C936 /* MFRadioButton.m in Sources */,
 				0A6BF4722360C56C0028F841 /* BaseDropdownEntryField.swift in Sources */,
@@ -1588,7 +1587,7 @@
 				01509D912327ECE600EF99AA /* CornerLabels.swift in Sources */,
 				D22D1F1B220341F60077CEC0 /* MVMCoreUICheckBox.m in Sources */,
 				D29DF2CB21E7BFCC003B2FB9 /* MFSizeThreshold.m in Sources */,
-				946EE1BA237B66D80036751F /* ModelHelper.swift in Sources */,
+				946EE1BA237B66D80036751F /* MoleculeModelHelper.swift in Sources */,
 				01509D932327ECFB00EF99AA /* ProgressBar.swift in Sources */,
 				D29770F521F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsViewController.m in Sources */,
 			);
diff --git a/MVMCoreUI/Atoms/Buttons/MFTextButton+ModelExtension.swift b/MVMCoreUI/Atoms/Buttons/MFTextButton+ModelExtension.swift
index a6df6745..a86c072e 100644
--- a/MVMCoreUI/Atoms/Buttons/MFTextButton+ModelExtension.swift
+++ b/MVMCoreUI/Atoms/Buttons/MFTextButton+ModelExtension.swift
@@ -16,9 +16,6 @@ extension MFTextButton: ModelMoleculeViewProtocol {
         setTitleColor(model.textColor.uiColor, for: .normal)
         isEnabled = model.enabled
         backgroundColor = model.backgroundColor?.uiColor
-        //TODO: Use object when handleAction is rewrote to handle action model
-        if let actionMap = model.action.toJSON() {
-            MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
-        }
+        set(with: model.action, delegateObject: delegateObject, additionalData: additionalData)
     }
 }
diff --git a/MVMCoreUI/Atoms/Buttons/PrimaryButton+MoleculeProtocolExtension.swift b/MVMCoreUI/Atoms/Buttons/PrimaryButton+MoleculeProtocolExtension.swift
index f7192fc9..6f285e19 100644
--- a/MVMCoreUI/Atoms/Buttons/PrimaryButton+MoleculeProtocolExtension.swift
+++ b/MVMCoreUI/Atoms/Buttons/PrimaryButton+MoleculeProtocolExtension.swift
@@ -22,9 +22,6 @@ extension PrimaryButton: ModelMoleculeViewProtocol {
                 setAsSecondaryCustom()
             }
         }
-        //TODO: Use object when handleAction is rewrote to handle action model
-        if let actionMap = model.action.toJSON() {
-            MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
-        }
+        set(with: model.action, delegateObject: delegateObject, additionalData: additionalData)
     }
 }
diff --git a/MVMCoreUI/Models/Extensions/ModelHelper.swift b/MVMCoreUI/Models/Extensions/MoleculeModelHelper.swift
similarity index 98%
rename from MVMCoreUI/Models/Extensions/ModelHelper.swift
rename to MVMCoreUI/Models/Extensions/MoleculeModelHelper.swift
index 72bb5f8f..e10fcc38 100644
--- a/MVMCoreUI/Models/Extensions/ModelHelper.swift
+++ b/MVMCoreUI/Models/Extensions/MoleculeModelHelper.swift
@@ -1,5 +1,5 @@
 //
-//  ModelHelper.swift
+//  MoleculeModelHelper.swift
 //  MVMCoreUI
 //
 //  Created by Ryan on 11/12/19.
diff --git a/MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift b/MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
index 5bc59593..6a958061 100644
--- a/MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
+++ b/MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
@@ -38,7 +38,7 @@ import Foundation
         //need to move labelattributemodel to different method
         ModelRegistry.register(LabelAttributeFontModel.self)
         ModelRegistry.register(LabelAttributeColorModel.self)
-        ModelRegistry.register(LabelAttributeImageModel.self)
+        //ModelRegistry.register(LabelAttributeImageModel.self) // We need to separate the registry by types due to collisions...
         ModelRegistry.register(LabelAttributeUnderlineModel.self)
         ModelRegistry.register(LabelAttributeStrikeThroughModel.self)
         ModelRegistry.register(LabelAttributeActionModel.self)