diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
index a02f87ee..88aa1559 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
@@ -256,12 +256,12 @@ import UIKit
         title = model.title
         feedback = model.feedback
         errorMessage = model.errorMessage
-        isEnabled = model.isEnabled
+        isEnabled = model.enabled
         
-        if let isLocked = model.isLocked {
+        if let isLocked = model.locked {
             self.isLocked = isLocked
             
-        } else if let isSelected = model.isSelected{
+        } else if let isSelected = model.selected {
             self.isSelected = isSelected
         }
     }
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
index 729b3516..79de359b 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 
-@objcMembers public class EntryFieldModel: MoleculeModelProtocol, FormFieldProtocol, FormRuleWatcherFieldProtocol {
+@objcMembers public class EntryFieldModel: MoleculeModelProtocol, FormFieldProtocol, FormRuleWatcherFieldProtocol, EnableableModelProtocol {
 
     //--------------------------------------------------
     // MARK: - Properties
@@ -23,9 +23,9 @@ import Foundation
     public var title: String?
     public var feedback: String?
     public var errorMessage: String = ""
-    public var isEnabled: Bool = true
-    public var isLocked: Bool?
-    public var isSelected: Bool?
+    public var enabled: Bool = true
+    public var locked: Bool?
+    public var selected: Bool?
     public var text: String?
 
     public var fieldKey: String?
@@ -52,14 +52,12 @@ import Foundation
     private enum CodingKeys: String, CodingKey {
         case moleculeName
         case backgroundColor
-        case title = "label"
-        case isEnabled
+        case title
+        case enabled
         case feedback
-        case errorMessage = "errorMsg"
-        case isLocked
-        case isSelected
-        case isValid
-        case isRequired = "required"
+        case errorMessage
+        case locked
+        case selected
         case text
         case fieldKey
         case groupName
@@ -84,10 +82,9 @@ import Foundation
         title = try typeContainer.decodeIfPresent(String.self, forKey: .title)
         feedback = try typeContainer.decodeIfPresent(String.self, forKey: .feedback)
         errorMessage = try typeContainer.decodeIfPresent(String.self, forKey: .errorMessage) ?? ""
-        isEnabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .isEnabled) ?? true
-        isLocked = try typeContainer.decodeIfPresent(Bool.self, forKey: .isLocked)
-        isSelected = try typeContainer.decodeIfPresent(Bool.self, forKey: .isSelected)
-        isValid = try typeContainer.decodeIfPresent(Bool.self, forKey: .isValid)
+        enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) ?? true
+        locked = try typeContainer.decodeIfPresent(Bool.self, forKey: .locked)
+        selected = try typeContainer.decodeIfPresent(Bool.self, forKey: .selected)
         text = try typeContainer.decodeIfPresent(String.self, forKey: .text)
         
         baseValue = text
@@ -104,12 +101,11 @@ import Foundation
         try container.encodeIfPresent(title, forKey: .title)
         try container.encodeIfPresent(feedback, forKey: .feedback)
         try container.encode(errorMessage, forKey: .errorMessage)
-        try container.encode(isEnabled, forKey: .isEnabled)
-        try container.encode(isLocked, forKey: .isLocked)
-        try container.encode(isSelected, forKey: .isSelected)
-        try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
-        try container.encodeIfPresent(isValid, forKey: .isValid)
+        try container.encode(enabled, forKey: .enabled)
+        try container.encode(locked, forKey: .locked)
+        try container.encode(selected, forKey: .selected)
         try container.encodeIfPresent(text, forKey: .text)
+        try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
         try container.encodeIfPresent(groupName, forKey: .groupName)
     }
 }
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
index 2e7df5ee..a421cb46 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
@@ -308,14 +308,7 @@ import UIKit
             break
         }
         
-        if let regex = model.regex, !regex.isEmpty {
-            validationBlock = { enteredValue in
-                guard let value = enteredValue else { return false }
-                return MVMCoreUIUtility.validate(value, withRegularExpression: regex)
-            }
-        } else {
-            defaultValidationBlock()
-        }
+        defaultValidationBlock()
         
         uiTextFieldDelegate = delegateObject?.uiTextFieldDelegate
         observingTextFieldDelegate = delegateObject?.observingTextFieldDelegate
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift
index c35d812e..0057b46a 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift
@@ -27,7 +27,6 @@
     public var enabledTextColor: Color?
     public var disabledTextColor: Color?
     public var type: EntryType?
-    public var regex: String?
     
     //--------------------------------------------------
     // MARK: - Keys
@@ -40,7 +39,6 @@
         case enabledTextColor
         case disabledTextColor
         case type
-        case regex
     }
     
     //--------------------------------------------------
@@ -55,7 +53,6 @@
         enabledTextColor = try typeContainer.decodeIfPresent(Color.self, forKey: .enabledTextColor)
         disabledTextColor = try typeContainer.decodeIfPresent(Color.self, forKey: .disabledTextColor)
         type = try typeContainer.decodeIfPresent(EntryType.self, forKey: .type)
-        regex = try typeContainer.decodeIfPresent(String.self, forKey: .regex)
     }
     
     public override func encode(to encoder: Encoder) throws {
@@ -67,6 +64,5 @@
         try container.encodeIfPresent(enabledTextColor, forKey: .enabledTextColor)
         try container.encodeIfPresent(disabledTextColor, forKey: .disabledTextColor)
         try container.encodeIfPresent(type, forKey: .type)
-        try container.encodeIfPresent(regex, forKey: .regex)
     }
 }