diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 8dbf2f56..31c1d04d 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -111,6 +111,7 @@
 		0AB764D324460FA400E7FE72 /* UIPickerView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AB764D224460FA400E7FE72 /* UIPickerView+Extension.swift */; };
 		0ABD136D237CAD1E0081388D /* DateDropdownEntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ABD136C237CAD1E0081388D /* DateDropdownEntryField.swift */; };
 		0ABD1371237DB0450081388D /* ItemDropdownEntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ABD1370237DB0450081388D /* ItemDropdownEntryField.swift */; };
+		0AD93A9F24C0AA5100E56A97 /* ImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7918F423F5E7EA00772FF4 /* ImageView.swift */; };
 		0AE14F64238315D2005417F8 /* TextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE14F63238315D2005417F8 /* TextField.swift */; };
 		0AE98BAF23FEF956004C5109 /* ExternalLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE98BAE23FEF956004C5109 /* ExternalLink.swift */; };
 		0AE98BB323FF0934004C5109 /* ExternalLinkModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE98BB223FF0934004C5109 /* ExternalLinkModel.swift */; };
@@ -2392,6 +2393,7 @@
 				BB6C6AC0242232DF005F7224 /* ListOneColumnTextWithWhitespaceDividerTallModel.swift in Sources */,
 				8DEFA95E243DAC2F000D27E5 /* ListThreeColumnDataUsageDivider.swift in Sources */,
 				AAE7270E24AC8B9300A3ED0E /* HeadersH2CaretLink.swift in Sources */,
+				0AD93A9F24C0AA5100E56A97 /* ImageView.swift in Sources */,
 				D2A638FD22CA98280052ED1F /* HeadlineBody.swift in Sources */,
 				324FB6AC24936717002552C7 /* ListLeftVariableNumberedListBodyText.swift in Sources */,
 				AAA74A172410C04600080241 /* HeadersH2NoButtonsBodyText.swift in Sources */,
diff --git a/MVMCoreUI/BaseClasses/ImageView.swift b/MVMCoreUI/BaseClasses/ImageView.swift
index aa004d27..271ee615 100644
--- a/MVMCoreUI/BaseClasses/ImageView.swift
+++ b/MVMCoreUI/BaseClasses/ImageView.swift
@@ -8,7 +8,8 @@
 
 import UIKit
 
-open class ImageView: UIImageView, ModelMoleculeViewProtocol {
+
+open class ImageView: UIImageView, MoleculeViewProtocol {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
@@ -51,13 +52,19 @@ open class ImageView: UIImageView, ModelMoleculeViewProtocol {
         }
     }
     
+    public func reset() {
+            backgroundColor = .clear
+        }
+        
+    public func setAsMolecule() { }
+    
     //--------------------------------------------------
     // MARK: - ModelMoleculeViewProtocol
     //--------------------------------------------------
     
     public func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
         self.model = model
-        if let backgroundColor = model?.backgroundColor {
+        if let backgroundColor = model.backgroundColor {
             self.backgroundColor = backgroundColor.uiColor
         }
     }
@@ -88,12 +95,3 @@ extension ImageView: MVMCoreViewProtocol {
     }
 }
 
-// MARK:- MVMCoreUIMoleculeViewProtocol
-extension ImageView: MVMCoreUIMoleculeViewProtocol {
-    
-    open func reset() {
-        backgroundColor = .clear
-    }
-    
-    open func setAsMolecule() { }
-}