diff --git a/MVMCoreUI/Atoms/Buttons/CaretButton.swift b/MVMCoreUI/Atoms/Buttons/CaretButton.swift
index 4ca750c6..759dfdb4 100644
--- a/MVMCoreUI/Atoms/Buttons/CaretButton.swift
+++ b/MVMCoreUI/Atoms/Buttons/CaretButton.swift
@@ -17,7 +17,6 @@ open class CaretButton: MFCustomButton, MVMCoreUIMoleculeViewProtocol, MVMCoreUI
     private let CARET_VIEW_HEIGHT: Float = 10.5
     private let CARET_VIEW_WIDTH: Float = 6.5
 
-    
     //------------------------------------------------------
     // MARK: - Properties
     //------------------------------------------------------
@@ -52,8 +51,7 @@ open class CaretButton: MFCustomButton, MVMCoreUIMoleculeViewProtocol, MVMCoreUI
         changeCaretColor()
     }
     
-    public func updateView(_ size: CGFloat) {
-    }
+    public func updateView(_ size: CGFloat) { }
     
     //------------------------------------------------------
     // MARK: - Functions
diff --git a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
index 3d977170..3c30311d 100644
--- a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
@@ -9,7 +9,7 @@
 import UIKit
 
 
-open class DigitEntryField: TextEntryField, DigitBoxDelegate {
+@objcMembers open class DigitEntryField: TextEntryField, DigitBoxDelegate {
     //--------------------------------------------------
     // MARK: - Outlets
     //--------------------------------------------------
@@ -120,6 +120,7 @@ open class DigitEntryField: TextEntryField, DigitBoxDelegate {
             } else {
                 messageToTextFieldPin?.constant = 0
             }
+            
             super.descriptionText = newValue
         }
     }
@@ -151,7 +152,7 @@ open class DigitEntryField: TextEntryField, DigitBoxDelegate {
     
     required public init?(coder: NSCoder) {
         super.init(coder: coder)
-        fatalError("init(coder:) has not been implemented")
+        fatalError("DigitEntryField xib has not been implemented")
     }
     
     public init(numberOfDigits: Int) {
@@ -239,7 +240,6 @@ open class DigitEntryField: TextEntryField, DigitBoxDelegate {
         }
         
         if numberOfDigits > 0 {
-            
             let digitFields = [DigitBox](repeating: createDigitField(), count: numberOfDigits)
             
             for digitField in digitFields {
@@ -313,7 +313,7 @@ open class DigitEntryField: TextEntryField, DigitBoxDelegate {
         })
     }
     
-    func setDefaultValidationBlock() {
+    public override func defaultValidationBlock() {
         
         weak var weakSelf = self
         
diff --git a/MVMCoreUI/Atoms/TextFields/FormEntryField.swift b/MVMCoreUI/Atoms/TextFields/FormEntryField.swift
index e6b4f2f7..bc65bfd4 100644
--- a/MVMCoreUI/Atoms/TextFields/FormEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/FormEntryField.swift
@@ -37,9 +37,7 @@ import UIKit
     public var showErrorMessage = false
     
     public var errorMessage: String? {
-        didSet {
-            feedback = errorMessage
-        }
+        didSet { feedback = errorMessage }
     }
     
     public var isEnabled = true {
diff --git a/MVMCoreUI/Atoms/TextFields/MdnEntryField.swift b/MVMCoreUI/Atoms/TextFields/MdnEntryField.swift
index aec24696..f06c9a0a 100644
--- a/MVMCoreUI/Atoms/TextFields/MdnEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/MdnEntryField.swift
@@ -12,7 +12,7 @@ import UIKit
 import MVMCore
 
 
-class MdnEntryField: TextEntryField, ABPeoplePickerNavigationControllerDelegate, CNContactPickerDelegate {
+@objcMembers open class MdnEntryField: TextEntryField, ABPeoplePickerNavigationControllerDelegate, CNContactPickerDelegate {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
index edd39fd8..e676e02e 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
@@ -36,8 +36,10 @@
                      @"footer": StandardFooterView.class,
                      @"caretView": CaretView.class,
                      @"caretButton": CaretButton.class,
-                     @"textField" : TextEntryField.class,
-//                     @"digitTextField" : DigitTextField.class,
+                     @"textField": TextEntryField.class,
+                     @"digitEntryField": DigitEntryField.class,
+                     @"mdnEntryField" : MdnEntryField.class,
+                     @"dropdownEntryField" : DropdownEntryField.class,
                      @"checkbox" : Checkbox.class,
                      @"checkboxWithLabelView" : CheckboxWithLabelView.class,
                      @"cornerLabels" : CornerLabels.class,