diff --git a/Assets/Plugins/Essgee.Unity/Emulation/EmulatorHandler.cs b/Assets/Plugins/Essgee.Unity/Emulation/EmulatorHandler.cs
index 33f0d19..9b48389 100644
--- a/Assets/Plugins/Essgee.Unity/Emulation/EmulatorHandler.cs
+++ b/Assets/Plugins/Essgee.Unity/Emulation/EmulatorHandler.cs
@@ -204,7 +204,7 @@ namespace Essgee.Emulation
             }
         }
 
-        public Dictionary<string, dynamic> GetDebugInformation()
+        public Dictionary<string, object> GetDebugInformation()
         {
             return emulator.GetDebugInformation();
         }
diff --git a/Assets/Plugins/Essgee.Unity/Emulation/Machines/ColecoVision.cs b/Assets/Plugins/Essgee.Unity/Emulation/Machines/ColecoVision.cs
index 7df654e..49079a3 100644
--- a/Assets/Plugins/Essgee.Unity/Emulation/Machines/ColecoVision.cs
+++ b/Assets/Plugins/Essgee.Unity/Emulation/Machines/ColecoVision.cs
@@ -236,9 +236,9 @@ namespace Essgee.Emulation.Machines
             ReconfigureSystem();
         }
 
-        public Dictionary<string, dynamic> GetState()
+        public Dictionary<string, object> GetState()
         {
-            return new Dictionary<string, dynamic>
+            return new Dictionary<string, object>
             {
                 [nameof(cartridge)] = SaveStateHandler.PerformGetState(cartridge),
                 [nameof(wram)] = wram,
@@ -254,9 +254,9 @@ namespace Essgee.Emulation.Machines
             };
         }
 
-        public Dictionary<string, dynamic> GetDebugInformation()
+        public Dictionary<string, object> GetDebugInformation()
         {
-            var dict = new Dictionary<string, dynamic>
+            var dict = new Dictionary<string, object>
             {
                 { "CyclesInFrame", currentMasterClockCyclesInFrame },
             };
diff --git a/Assets/Plugins/Essgee.Unity/Emulation/Machines/GameBoy.cs b/Assets/Plugins/Essgee.Unity/Emulation/Machines/GameBoy.cs
index 723811a..983b68e 100644
--- a/Assets/Plugins/Essgee.Unity/Emulation/Machines/GameBoy.cs
+++ b/Assets/Plugins/Essgee.Unity/Emulation/Machines/GameBoy.cs
@@ -306,19 +306,19 @@ namespace Essgee.Emulation.Machines
             audio?.Shutdown();
         }
 
-        public void SetState(Dictionary<string, dynamic> state)
+        public void SetState(Dictionary<string, object> state)
         {
             throw new NotImplementedException();
         }
 
-        public Dictionary<string, dynamic> GetState()
+        public Dictionary<string, object> GetState()
         {
             throw new NotImplementedException();
         }
 
-        public Dictionary<string, dynamic> GetDebugInformation()
+        public Dictionary<string, object> GetDebugInformation()
         {
-            var dict = new Dictionary<string, dynamic>
+            var dict = new Dictionary<string, object>
             {
                 { "CyclesInFrame", currentMasterClockCyclesInFrame },
             };
diff --git a/Assets/Plugins/Essgee.Unity/Emulation/Machines/GameBoyColor.cs b/Assets/Plugins/Essgee.Unity/Emulation/Machines/GameBoyColor.cs
index 56c4f1c..b97e463 100644
--- a/Assets/Plugins/Essgee.Unity/Emulation/Machines/GameBoyColor.cs
+++ b/Assets/Plugins/Essgee.Unity/Emulation/Machines/GameBoyColor.cs
@@ -363,19 +363,19 @@ namespace Essgee.Emulation.Machines
             audio?.Shutdown();
         }
 
-        public void SetState(Dictionary<string, dynamic> state)
+        public void SetState(Dictionary<string, object> state)
         {
             throw new NotImplementedException();
         }
 
-        public Dictionary<string, dynamic> GetState()
+        public Dictionary<string, object> GetState()
         {
             throw new NotImplementedException();
         }
 
-        public Dictionary<string, dynamic> GetDebugInformation()
+        public Dictionary<string, object> GetDebugInformation()
         {
-            var dict = new Dictionary<string, dynamic>
+            var dict = new Dictionary<string, object>
             {
                 { "CyclesInFrame", currentMasterClockCyclesInFrame },
             };
diff --git a/Assets/Plugins/Essgee.Unity/Emulation/Machines/GameGear.cs b/Assets/Plugins/Essgee.Unity/Emulation/Machines/GameGear.cs
index e396fca..cd43873 100644
--- a/Assets/Plugins/Essgee.Unity/Emulation/Machines/GameGear.cs
+++ b/Assets/Plugins/Essgee.Unity/Emulation/Machines/GameGear.cs
@@ -268,9 +268,9 @@ namespace Essgee.Emulation.Machines
             ReconfigureSystem();
         }
 
-        public Dictionary<string, dynamic> GetState()
+        public Dictionary<string, object> GetState()
         {
-            return new Dictionary<string, dynamic>
+            return new Dictionary<string, object>
             {
                 [nameof(configuration.Region)] = configuration.Region,
 
@@ -296,9 +296,9 @@ namespace Essgee.Emulation.Machines
             };
         }
 
-        public Dictionary<string, dynamic> GetDebugInformation()
+        public Dictionary<string, object> GetDebugInformation()
         {
-            var dict = new Dictionary<string, dynamic>
+            var dict = new Dictionary<string, object>
             {
                 { "CyclesInFrame", currentMasterClockCyclesInFrame },
             };
diff --git a/Assets/Plugins/Essgee.Unity/Emulation/Machines/IMachine.cs b/Assets/Plugins/Essgee.Unity/Emulation/Machines/IMachine.cs
index 3740adb..677181c 100644
--- a/Assets/Plugins/Essgee.Unity/Emulation/Machines/IMachine.cs
+++ b/Assets/Plugins/Essgee.Unity/Emulation/Machines/IMachine.cs
@@ -26,7 +26,7 @@ namespace Essgee.Emulation.Machines
         double PixelAspectRatio { get; }
         (string Name, string Description)[] RuntimeOptions { get; }
 
-        Dictionary<string, dynamic> GetDebugInformation();
+        Dictionary<string, object> GetDebugInformation();
 
         void SetConfiguration(IConfiguration config);
 
@@ -38,8 +38,8 @@ namespace Essgee.Emulation.Machines
         void Reset();
         void Shutdown();
 
-        void SetState(Dictionary<string, dynamic> state);
-        Dictionary<string, dynamic> GetState();
+        void SetState(Dictionary<string, object> state);
+        Dictionary<string, object> GetState();
 
         void Load(byte[] romData, byte[] ramData, Type mapperType);
         byte[] GetCartridgeRam();
diff --git a/Assets/Plugins/Essgee.Unity/Emulation/Machines/MasterSystem.cs b/Assets/Plugins/Essgee.Unity/Emulation/Machines/MasterSystem.cs
index 45699c2..b0c131c 100644
--- a/Assets/Plugins/Essgee.Unity/Emulation/Machines/MasterSystem.cs
+++ b/Assets/Plugins/Essgee.Unity/Emulation/Machines/MasterSystem.cs
@@ -290,9 +290,9 @@ namespace Essgee.Emulation.Machines
             ReconfigureSystem();
         }
 
-        public Dictionary<string, dynamic> GetState()
+        public Dictionary<string, object> GetState()
         {
-            return new Dictionary<string, dynamic>
+            return new Dictionary<string, object>
             {
                 [nameof(configuration.TVStandard)] = configuration.TVStandard,
                 [nameof(configuration.Region)] = configuration.Region,
@@ -313,9 +313,9 @@ namespace Essgee.Emulation.Machines
             };
         }
 
-        public Dictionary<string, dynamic> GetDebugInformation()
+        public Dictionary<string, object> GetDebugInformation()
         {
-            var dict = new Dictionary<string, dynamic>
+            var dict = new Dictionary<string, object>
             {
                 { "CyclesInFrame", currentMasterClockCyclesInFrame },
             };
diff --git a/Assets/Plugins/Essgee.Unity/Emulation/Machines/SC3000.cs b/Assets/Plugins/Essgee.Unity/Emulation/Machines/SC3000.cs
index b9c6f70..0c8756a 100644
--- a/Assets/Plugins/Essgee.Unity/Emulation/Machines/SC3000.cs
+++ b/Assets/Plugins/Essgee.Unity/Emulation/Machines/SC3000.cs
@@ -260,9 +260,9 @@ namespace Essgee.Emulation.Machines
             ReconfigureSystem();
         }
 
-        public Dictionary<string, dynamic> GetState()
+        public Dictionary<string, object> GetState()
         {
-            return new Dictionary<string, dynamic>
+            return new Dictionary<string, object>
             {
                 [nameof(configuration.TVStandard)] = configuration.TVStandard,
 
@@ -276,9 +276,9 @@ namespace Essgee.Emulation.Machines
             };
         }
 
-        public Dictionary<string, dynamic> GetDebugInformation()
+        public Dictionary<string, object> GetDebugInformation()
         {
-            var dict = new Dictionary<string, dynamic>
+            var dict = new Dictionary<string, object>
             {
                 { "CyclesInFrame", currentMasterClockCyclesInFrame },
             };
diff --git a/Assets/Plugins/Essgee.Unity/Emulation/Machines/SG1000.cs b/Assets/Plugins/Essgee.Unity/Emulation/Machines/SG1000.cs
index bb58110..da6a7a1 100644
--- a/Assets/Plugins/Essgee.Unity/Emulation/Machines/SG1000.cs
+++ b/Assets/Plugins/Essgee.Unity/Emulation/Machines/SG1000.cs
@@ -235,9 +235,9 @@ namespace Essgee.Emulation.Machines
             ReconfigureSystem();
         }
 
-        public Dictionary<string, dynamic> GetState()
+        public Dictionary<string, object> GetState()
         {
-            return new Dictionary<string, dynamic>
+            return new Dictionary<string, object>
             {
                 [nameof(configuration.TVStandard)] = configuration.TVStandard,
 
@@ -249,9 +249,9 @@ namespace Essgee.Emulation.Machines
             };
         }
 
-        public Dictionary<string, dynamic> GetDebugInformation()
+        public Dictionary<string, object> GetDebugInformation()
         {
-            var dict = new Dictionary<string, dynamic>
+            var dict = new Dictionary<string, object>
             {
                 { "CyclesInFrame", currentMasterClockCyclesInFrame },
             };
diff --git a/Assets/Plugins/Essgee.Unity/Emulation/SaveStateHandler.cs b/Assets/Plugins/Essgee.Unity/Emulation/SaveStateHandler.cs
index e45ea45..aa659db 100644
--- a/Assets/Plugins/Essgee.Unity/Emulation/SaveStateHandler.cs
+++ b/Assets/Plugins/Essgee.Unity/Emulation/SaveStateHandler.cs
@@ -14,7 +14,7 @@ namespace Essgee.Emulation
     {
         public static string ExpectedVersion = $"ESGST{new Version(EmuStandInfo.ProductVersion).Major:D3}";
 
-        public static Dictionary<string, dynamic> Load(Stream stream, string machineName)
+        public static Dictionary<string, object> Load(Stream stream, string machineName)
         {
             stream.Position = 0;
 
@@ -45,12 +45,12 @@ namespace Essgee.Emulation
 
                     /* Read state data */
                     var binaryFormatter = new BinaryFormatter();
-                    return (binaryFormatter.Deserialize(stateStream) as Dictionary<string, dynamic>);
+                    return (binaryFormatter.Deserialize(stateStream) as Dictionary<string, object>);
                 }
             }
         }
 
-        public static void Save(Stream stream, string machineName, Dictionary<string, dynamic> state)
+        public static void Save(Stream stream, string machineName, Dictionary<string, object> state)
         {
             using (var writer = new BinaryWriter(new MemoryStream()))
             {