diff --git a/MVMCoreUI/Atomic/Atoms/Views/ToggleModel.swift b/MVMCoreUI/Atomic/Atoms/Views/ToggleModel.swift
index 334ba00f..9e9e9e4a 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/ToggleModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/ToggleModel.swift
@@ -63,14 +63,14 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol, EnableableMo
         action = try typeContainer.decodeModelIfPresent(codingKey: .action)
         alternateAction = try typeContainer.decodeModelIfPresent(codingKey: .alternateAction)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
-        fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey)
-        if let groupName = try typeContainer.decodeIfPresent(String.self, forKey: .groupName) {
-            self.groupName = groupName
-        }
         onTintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .onTintColor)
         offTintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .offTintColor)
         onKnobTintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .onKnobTintColor)
         offKnobTintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .offKnobTintColor)
+        fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey)
+        if let groupName = try typeContainer.decodeIfPresent(String.self, forKey: .groupName) {
+            self.groupName = groupName
+        }
     }
     
     public func encode(to encoder: Encoder) throws {
@@ -80,11 +80,13 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol, EnableableMo
         try container.encodeModelIfPresent(alternateAction, forKey: .alternateAction)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(state, forKey: .state)
-        try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
-        try container.encodeIfPresent(groupName, forKey: .groupName)
+        try container.encode(animated, forKey: .animated)
+        try container.encode(enabled, forKey: .enabled)
         try container.encodeIfPresent(onTintColor, forKey: .onTintColor)
         try container.encodeIfPresent(onKnobTintColor, forKey: .onKnobTintColor)
         try container.encodeIfPresent(onKnobTintColor, forKey: .onKnobTintColor)
         try container.encodeIfPresent(offKnobTintColor, forKey: .offKnobTintColor)
+        try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
+        try container.encodeIfPresent(groupName, forKey: .groupName)
     }
 }