diff --git a/SabreTools.Serialization/Bytes/AACS.Deserializer.cs b/SabreTools.Serialization/Bytes/AACS.Deserializer.cs
index 8d468f92..9e513953 100644
--- a/SabreTools.Serialization/Bytes/AACS.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/AACS.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.AACS;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class AACS : IByteSerializer<MediaKeyBlock>
+    public partial class AACS : IByteSerializer<Models.AACS.MediaKeyBlock>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.AACS.MediaKeyBlock? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new AACS();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public MediaKeyBlock? Deserialize(byte[]? data, int offset)
+        public Models.AACS.MediaKeyBlock? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.AACS().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/BDPlus.Deserializer.cs b/SabreTools.Serialization/Bytes/BDPlus.Deserializer.cs
index 775a98c2..51ba3d2d 100644
--- a/SabreTools.Serialization/Bytes/BDPlus.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/BDPlus.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.BDPlus;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class BDPlus : IByteSerializer<SVM>
+    public partial class BDPlus : IByteSerializer<Models.BDPlus.SVM>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.BDPlus.SVM? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new BDPlus();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public SVM? Deserialize(byte[]? data, int offset)
+        public Models.BDPlus.SVM? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.BDPlus().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/BFPK.Deserializer.cs b/SabreTools.Serialization/Bytes/BFPK.Deserializer.cs
index 56f23bfe..3edd2184 100644
--- a/SabreTools.Serialization/Bytes/BFPK.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/BFPK.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.BFPK;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class BFPK : IByteSerializer<Archive>
+    public partial class BFPK : IByteSerializer<Models.BFPK.Archive>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.BFPK.Archive? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new BFPK();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Archive? Deserialize(byte[]? data, int offset)
+        public Models.BFPK.Archive? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.BFPK().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/BSP.Deserializer.cs b/SabreTools.Serialization/Bytes/BSP.Deserializer.cs
index e299a89e..334b4588 100644
--- a/SabreTools.Serialization/Bytes/BSP.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/BSP.Deserializer.cs
@@ -5,8 +5,15 @@ namespace SabreTools.Serialization.Bytes
 {
     public partial class BSP : IByteSerializer<Models.BSP.File>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.BSP.File? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new BSP();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Models.BSP.File? Deserialize(byte[]? data, int offset)
+        public Models.BSP.File? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -17,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.BSP().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/CFB.Deserializer.cs b/SabreTools.Serialization/Bytes/CFB.Deserializer.cs
index 774efbd5..ade8194a 100644
--- a/SabreTools.Serialization/Bytes/CFB.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/CFB.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.CFB;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class CFB : IByteSerializer<Binary>
+    public partial class CFB : IByteSerializer<Models.CFB.Binary>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.CFB.Binary? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new CFB();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Binary? Deserialize(byte[]? data, int offset)
+        public Models.CFB.Binary? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.CFB().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/CIA.Deserializer.cs b/SabreTools.Serialization/Bytes/CIA.Deserializer.cs
index 84a12dfa..c70d5085 100644
--- a/SabreTools.Serialization/Bytes/CIA.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/CIA.Deserializer.cs
@@ -5,8 +5,15 @@ namespace SabreTools.Serialization.Bytes
 {
     public partial class CIA : IByteSerializer<Models.N3DS.CIA>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.N3DS.CIA? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new CIA();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Models.N3DS.CIA? Deserialize(byte[]? data, int offset)
+        public Models.N3DS.CIA? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -17,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.CIA().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/GCF.Deserializer.cs b/SabreTools.Serialization/Bytes/GCF.Deserializer.cs
index f5f798b8..a5f222c3 100644
--- a/SabreTools.Serialization/Bytes/GCF.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/GCF.Deserializer.cs
@@ -5,8 +5,15 @@ namespace SabreTools.Serialization.Bytes
 {
     public partial class GCF : IByteSerializer<Models.GCF.File>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.GCF.File? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new GCF();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Models.GCF.File? Deserialize(byte[]? data, int offset)
+        public Models.GCF.File? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -17,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.GCF().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/IRD.Deserializer.cs b/SabreTools.Serialization/Bytes/IRD.Deserializer.cs
index c5eeb4bd..ce715783 100644
--- a/SabreTools.Serialization/Bytes/IRD.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/IRD.Deserializer.cs
@@ -5,8 +5,15 @@ namespace SabreTools.Serialization.Bytes
 {
     public partial class IRD : IByteSerializer<Models.IRD.File>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.IRD.File? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new IRD();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Models.IRD.File? Deserialize(byte[]? data, int offset)
+        public Models.IRD.File? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -17,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.IRD().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/InstallShieldCabinet.Deserializer.cs b/SabreTools.Serialization/Bytes/InstallShieldCabinet.Deserializer.cs
index a2c47af5..7c250f9c 100644
--- a/SabreTools.Serialization/Bytes/InstallShieldCabinet.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/InstallShieldCabinet.Deserializer.cs
@@ -1,14 +1,20 @@
 using System.IO;
-using SabreTools.Models.InstallShieldCabinet;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
     // TODO: Add multi-cabinet reading
-    public partial class InstallShieldCabinet : IByteSerializer<Cabinet>
+    public partial class InstallShieldCabinet : IByteSerializer<Models.InstallShieldCabinet.Cabinet>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.InstallShieldCabinet.Cabinet? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new InstallShieldCabinet();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Cabinet? Deserialize(byte[]? data, int offset)
+        public Models.InstallShieldCabinet.Cabinet? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -19,7 +25,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.InstallShieldCabinet().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/LinearExecutable.Deserializer.cs b/SabreTools.Serialization/Bytes/LinearExecutable.Deserializer.cs
index ba2630c9..9b263ae0 100644
--- a/SabreTools.Serialization/Bytes/LinearExecutable.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/LinearExecutable.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.LinearExecutable;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class LinearExecutable : IByteSerializer<Executable>
+    public partial class LinearExecutable : IByteSerializer<Models.LinearExecutable.Executable>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.LinearExecutable.Executable? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new LinearExecutable();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Executable? Deserialize(byte[]? data, int offset)
+        public Models.LinearExecutable.Executable? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.LinearExecutable().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/MSDOS.Deserializer.cs b/SabreTools.Serialization/Bytes/MSDOS.Deserializer.cs
index dbd29d2e..a7324811 100644
--- a/SabreTools.Serialization/Bytes/MSDOS.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/MSDOS.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.MSDOS;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class MSDOS : IByteSerializer<Executable>
+    public partial class MSDOS : IByteSerializer<Models.MSDOS.Executable>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.MSDOS.Executable? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new MSDOS();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Executable? Deserialize(byte[]? data, int offset)
+        public Models.MSDOS.Executable? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.MSDOS().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/MicrosoftCabinet.Deserializer.cs b/SabreTools.Serialization/Bytes/MicrosoftCabinet.Deserializer.cs
index 96292598..e31731cf 100644
--- a/SabreTools.Serialization/Bytes/MicrosoftCabinet.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/MicrosoftCabinet.Deserializer.cs
@@ -1,14 +1,20 @@
 using System.IO;
-using SabreTools.Models.MicrosoftCabinet;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
     // TODO: Add multi-cabinet reading
-    public partial class MicrosoftCabinet : IByteSerializer<Cabinet>
+    public partial class MicrosoftCabinet : IByteSerializer<Models.MicrosoftCabinet.Cabinet>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.MicrosoftCabinet.Cabinet? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new MicrosoftCabinet();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Cabinet? Deserialize(byte[]? data, int offset)
+        public Models.MicrosoftCabinet.Cabinet? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -19,7 +25,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.MicrosoftCabinet().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/MoPaQ.Deserializer.cs b/SabreTools.Serialization/Bytes/MoPaQ.Deserializer.cs
index 218211d4..30e71eae 100644
--- a/SabreTools.Serialization/Bytes/MoPaQ.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/MoPaQ.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.MoPaQ;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class MoPaQ : IByteSerializer<Archive>
+    public partial class MoPaQ : IByteSerializer<Models.MoPaQ.Archive>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.MoPaQ.Archive? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new MoPaQ();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Archive? Deserialize(byte[]? data, int offset)
+        public Models.MoPaQ.Archive? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.MoPaQ().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/N3DS.Deserializer.cs b/SabreTools.Serialization/Bytes/N3DS.Deserializer.cs
index d4b18b38..d835b226 100644
--- a/SabreTools.Serialization/Bytes/N3DS.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/N3DS.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.N3DS;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class N3DS : IByteSerializer<Cart>
+    public partial class N3DS : IByteSerializer<Models.N3DS.Cart>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.N3DS.Cart? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new N3DS();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Cart? Deserialize(byte[]? data, int offset)
+        public Models.N3DS.Cart? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.N3DS().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/NCF.Deserializer.cs b/SabreTools.Serialization/Bytes/NCF.Deserializer.cs
index a04a2f0c..a22c5361 100644
--- a/SabreTools.Serialization/Bytes/NCF.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/NCF.Deserializer.cs
@@ -5,8 +5,15 @@ namespace SabreTools.Serialization.Bytes
 {
     public partial class NCF : IByteSerializer<Models.NCF.File>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.NCF.File? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new NCF();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Models.NCF.File? Deserialize(byte[]? data, int offset)
+        public Models.NCF.File? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -17,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.NCF().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/NewExecutable.Deserializer.cs b/SabreTools.Serialization/Bytes/NewExecutable.Deserializer.cs
index d1364080..72da50b8 100644
--- a/SabreTools.Serialization/Bytes/NewExecutable.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/NewExecutable.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.NewExecutable;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class NewExecutable : IByteSerializer<Executable>
+    public partial class NewExecutable : IByteSerializer<Models.NewExecutable.Executable>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.NewExecutable.Executable? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new NewExecutable();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Executable? Deserialize(byte[]? data, int offset)
+        public Models.NewExecutable.Executable? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.NewExecutable().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/Nitro.Deserializer.cs b/SabreTools.Serialization/Bytes/Nitro.Deserializer.cs
index 8d97a586..c1c8c7c3 100644
--- a/SabreTools.Serialization/Bytes/Nitro.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/Nitro.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.Nitro;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class Nitro : IByteSerializer<Cart>
+    public partial class Nitro : IByteSerializer<Models.Nitro.Cart>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.Nitro.Cart? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new Nitro();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Cart? Deserialize(byte[]? data, int offset)
+        public Models.Nitro.Cart? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.Nitro().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/PAK.Deserializer.cs b/SabreTools.Serialization/Bytes/PAK.Deserializer.cs
index 0a285865..1f409996 100644
--- a/SabreTools.Serialization/Bytes/PAK.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/PAK.Deserializer.cs
@@ -5,8 +5,15 @@ namespace SabreTools.Serialization.Bytes
 {
     public partial class PAK : IByteSerializer<Models.PAK.File>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.PAK.File? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new PAK();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Models.PAK.File? Deserialize(byte[]? data, int offset)
+        public Models.PAK.File? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -17,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.PAK().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/PFF.Deserializer.cs b/SabreTools.Serialization/Bytes/PFF.Deserializer.cs
index fe93da8a..2aff4dd6 100644
--- a/SabreTools.Serialization/Bytes/PFF.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/PFF.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.PFF;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class PFF : IByteSerializer<Archive>
+    public partial class PFF : IByteSerializer<Models.PFF.Archive>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.PFF.Archive? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new PFF();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Archive? Deserialize(byte[]? data, int offset)
+        public Models.PFF.Archive? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.PFF().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/PlayJAudio.Deserializer.cs b/SabreTools.Serialization/Bytes/PlayJAudio.Deserializer.cs
index a0238d4c..e6c6ba78 100644
--- a/SabreTools.Serialization/Bytes/PlayJAudio.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/PlayJAudio.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.PlayJ;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class PlayJAudio : IByteSerializer<AudioFile>
+    public partial class PlayJAudio : IByteSerializer<Models.PlayJ.AudioFile>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.PlayJ.AudioFile? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new PlayJAudio();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public AudioFile? Deserialize(byte[]? data, int offset)
+        public Models.PlayJ.AudioFile? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.PlayJAudio().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/PlayJPlaylist.Deserializer.cs b/SabreTools.Serialization/Bytes/PlayJPlaylist.Deserializer.cs
index d12762cb..9c49fac2 100644
--- a/SabreTools.Serialization/Bytes/PlayJPlaylist.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/PlayJPlaylist.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.PlayJ;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class PlayJPlaylist : IByteSerializer<Playlist>
+    public partial class PlayJPlaylist : IByteSerializer<Models.PlayJ.Playlist>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.PlayJ.Playlist? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new PlayJPlaylist();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Playlist? Deserialize(byte[]? data, int offset)
+        public Models.PlayJ.Playlist? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.PlayJPlaylist().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/PortableExecutable.Deserializer.cs b/SabreTools.Serialization/Bytes/PortableExecutable.Deserializer.cs
index b4a8e722..51061c64 100644
--- a/SabreTools.Serialization/Bytes/PortableExecutable.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/PortableExecutable.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.PortableExecutable;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class PortableExecutable : IByteSerializer<Executable>
+    public partial class PortableExecutable : IByteSerializer<Models.PortableExecutable.Executable>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.PortableExecutable.Executable? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new PortableExecutable();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Executable? Deserialize(byte[]? data, int offset)
+        public Models.PortableExecutable.Executable? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.PortableExecutable().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/Quantum.Deserializer.cs b/SabreTools.Serialization/Bytes/Quantum.Deserializer.cs
index 027ede95..f4e15250 100644
--- a/SabreTools.Serialization/Bytes/Quantum.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/Quantum.Deserializer.cs
@@ -1,13 +1,19 @@
 using System.IO;
-using SabreTools.Models.Quantum;
 using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
-    public partial class Quantum : IByteSerializer<Archive>
+    public partial class Quantum : IByteSerializer<Models.Quantum.Archive>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.Quantum.Archive? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new Quantum();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Archive? Deserialize(byte[]? data, int offset)
+        public Models.Quantum.Archive? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -18,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.Quantum().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/SGA.Deserializer.cs b/SabreTools.Serialization/Bytes/SGA.Deserializer.cs
index 7bbb8a01..faea548e 100644
--- a/SabreTools.Serialization/Bytes/SGA.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/SGA.Deserializer.cs
@@ -5,8 +5,15 @@ namespace SabreTools.Serialization.Bytes
 {
     public partial class SGA : IByteSerializer<Models.SGA.File>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.SGA.File? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new SGA();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Models.SGA.File? Deserialize(byte[]? data, int offset)
+        public Models.SGA.File? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -17,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.SGA().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/VBSP.Deserializer.cs b/SabreTools.Serialization/Bytes/VBSP.Deserializer.cs
index ace836b1..c4c82863 100644
--- a/SabreTools.Serialization/Bytes/VBSP.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/VBSP.Deserializer.cs
@@ -5,8 +5,15 @@ namespace SabreTools.Serialization.Bytes
 {
     public partial class VBSP : IByteSerializer<Models.VBSP.File>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.VBSP.File? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new VBSP();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Models.VBSP.File? Deserialize(byte[]? data, int offset)
+        public Models.VBSP.File? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -17,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.VBSP().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/VPK.Deserializer.cs b/SabreTools.Serialization/Bytes/VPK.Deserializer.cs
index d6a39946..03522402 100644
--- a/SabreTools.Serialization/Bytes/VPK.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/VPK.Deserializer.cs
@@ -5,8 +5,15 @@ namespace SabreTools.Serialization.Bytes
 {
     public partial class VPK : IByteSerializer<Models.VPK.File>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.VPK.File? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new VPK();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Models.VPK.File? Deserialize(byte[]? data, int offset)
+        public Models.VPK.File? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -17,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.VPK().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/WAD.Deserializer.cs b/SabreTools.Serialization/Bytes/WAD.Deserializer.cs
index ef3d89f7..c103c1ed 100644
--- a/SabreTools.Serialization/Bytes/WAD.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/WAD.Deserializer.cs
@@ -5,8 +5,15 @@ namespace SabreTools.Serialization.Bytes
 {
     public partial class WAD : IByteSerializer<Models.WAD.File>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.WAD.File? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new WAD();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Models.WAD.File? Deserialize(byte[]? data, int offset)
+        public Models.WAD.File? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -17,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.WAD().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Bytes/XZP.Deserializer.cs b/SabreTools.Serialization/Bytes/XZP.Deserializer.cs
index f50f72eb..5fa1240c 100644
--- a/SabreTools.Serialization/Bytes/XZP.Deserializer.cs
+++ b/SabreTools.Serialization/Bytes/XZP.Deserializer.cs
@@ -5,8 +5,15 @@ namespace SabreTools.Serialization.Bytes
 {
     public partial class XZP : IByteSerializer<Models.XZP.File>
     {
+        /// <inheritdoc cref="IByteSerializer.Deserialize(byte[]?, int)"/>
+        public static Models.XZP.File? Deserialize(byte[]? data, int offset)
+        {
+            var obj = new XZP();
+            return obj.DeserializeImpl(data, offset);
+        }
+
         /// <inheritdoc/>
-        public Models.XZP.File? Deserialize(byte[]? data, int offset)
+        public Models.XZP.File? DeserializeImpl(byte[]? data, int offset)
         {
             // If the data is invalid
             if (data == null)
@@ -17,7 +24,7 @@ namespace SabreTools.Serialization.Bytes
                 return null;
 
             // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return new Streams.XZP().Deserialize(dataStream);
         }
     }
diff --git a/SabreTools.Serialization/Interfaces/IByteSerializer.cs b/SabreTools.Serialization/Interfaces/IByteSerializer.cs
index 01f84a48..26ec3e0d 100644
--- a/SabreTools.Serialization/Interfaces/IByteSerializer.cs
+++ b/SabreTools.Serialization/Interfaces/IByteSerializer.cs
@@ -12,7 +12,7 @@ namespace SabreTools.Serialization.Interfaces
         /// <param name="data">Byte array to parse</param>
         /// <param name="offset">Offset into the byte array</param>
         /// <returns>Filled object on success, null on error</returns>
-        T? Deserialize(byte[]? data, int offset);
+        T? DeserializeImpl(byte[]? data, int offset);
 
         // TODO: Add serialization method
     }
diff --git a/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs b/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs
index f99fe189..f72784f3 100644
--- a/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs
+++ b/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs
@@ -45,7 +45,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/BDPlusSVM.cs b/SabreTools.Serialization/Wrappers/BDPlusSVM.cs
index 9e3037da..5358b491 100644
--- a/SabreTools.Serialization/Wrappers/BDPlusSVM.cs
+++ b/SabreTools.Serialization/Wrappers/BDPlusSVM.cs
@@ -45,7 +45,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/BFPK.cs b/SabreTools.Serialization/Wrappers/BFPK.cs
index 2d0513b0..5cd72ed1 100644
--- a/SabreTools.Serialization/Wrappers/BFPK.cs
+++ b/SabreTools.Serialization/Wrappers/BFPK.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/BSP.cs b/SabreTools.Serialization/Wrappers/BSP.cs
index 5fca10a5..d3c5cfae 100644
--- a/SabreTools.Serialization/Wrappers/BSP.cs
+++ b/SabreTools.Serialization/Wrappers/BSP.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/CFB.cs b/SabreTools.Serialization/Wrappers/CFB.cs
index 3807443a..a3b044ec 100644
--- a/SabreTools.Serialization/Wrappers/CFB.cs
+++ b/SabreTools.Serialization/Wrappers/CFB.cs
@@ -60,7 +60,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/CIA.cs b/SabreTools.Serialization/Wrappers/CIA.cs
index b46ac045..4adb0b8a 100644
--- a/SabreTools.Serialization/Wrappers/CIA.cs
+++ b/SabreTools.Serialization/Wrappers/CIA.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/IRD.cs b/SabreTools.Serialization/Wrappers/IRD.cs
index aa1f56d5..645bf856 100644
--- a/SabreTools.Serialization/Wrappers/IRD.cs
+++ b/SabreTools.Serialization/Wrappers/IRD.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
index 3a83bcc9..d652a17d 100644
--- a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
+++ b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
@@ -71,7 +71,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/LinearExecutable.cs b/SabreTools.Serialization/Wrappers/LinearExecutable.cs
index 4f7e602f..00beb940 100644
--- a/SabreTools.Serialization/Wrappers/LinearExecutable.cs
+++ b/SabreTools.Serialization/Wrappers/LinearExecutable.cs
@@ -43,7 +43,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/MSDOS.cs b/SabreTools.Serialization/Wrappers/MSDOS.cs
index 818c2abf..7ba2e655 100644
--- a/SabreTools.Serialization/Wrappers/MSDOS.cs
+++ b/SabreTools.Serialization/Wrappers/MSDOS.cs
@@ -42,7 +42,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs b/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs
index fa5c033b..2f469396 100644
--- a/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs
+++ b/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs
@@ -43,7 +43,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/N3DS.cs b/SabreTools.Serialization/Wrappers/N3DS.cs
index e418e9a7..7612510a 100644
--- a/SabreTools.Serialization/Wrappers/N3DS.cs
+++ b/SabreTools.Serialization/Wrappers/N3DS.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/NCF.cs b/SabreTools.Serialization/Wrappers/NCF.cs
index 58407217..ccb91d04 100644
--- a/SabreTools.Serialization/Wrappers/NCF.cs
+++ b/SabreTools.Serialization/Wrappers/NCF.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/NewExecutable.cs b/SabreTools.Serialization/Wrappers/NewExecutable.cs
index 116c96cb..a5a15019 100644
--- a/SabreTools.Serialization/Wrappers/NewExecutable.cs
+++ b/SabreTools.Serialization/Wrappers/NewExecutable.cs
@@ -45,7 +45,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/Nitro.cs b/SabreTools.Serialization/Wrappers/Nitro.cs
index a2bad27b..3f89a041 100644
--- a/SabreTools.Serialization/Wrappers/Nitro.cs
+++ b/SabreTools.Serialization/Wrappers/Nitro.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/PAK.cs b/SabreTools.Serialization/Wrappers/PAK.cs
index 0153f5b9..4d3ce1a8 100644
--- a/SabreTools.Serialization/Wrappers/PAK.cs
+++ b/SabreTools.Serialization/Wrappers/PAK.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/PFF.cs b/SabreTools.Serialization/Wrappers/PFF.cs
index 8045ad4b..2912281f 100644
--- a/SabreTools.Serialization/Wrappers/PFF.cs
+++ b/SabreTools.Serialization/Wrappers/PFF.cs
@@ -43,7 +43,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs b/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs
index b8d41724..c75443ed 100644
--- a/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs
+++ b/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/Quantum.cs b/SabreTools.Serialization/Wrappers/Quantum.cs
index ff0724e4..3eabda61 100644
--- a/SabreTools.Serialization/Wrappers/Quantum.cs
+++ b/SabreTools.Serialization/Wrappers/Quantum.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/SGA.cs b/SabreTools.Serialization/Wrappers/SGA.cs
index 604b510f..b62a1926 100644
--- a/SabreTools.Serialization/Wrappers/SGA.cs
+++ b/SabreTools.Serialization/Wrappers/SGA.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/VBSP.cs b/SabreTools.Serialization/Wrappers/VBSP.cs
index 719accee..bc2ba6e6 100644
--- a/SabreTools.Serialization/Wrappers/VBSP.cs
+++ b/SabreTools.Serialization/Wrappers/VBSP.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/VPK.cs b/SabreTools.Serialization/Wrappers/VPK.cs
index eda5a0c7..f16302d4 100644
--- a/SabreTools.Serialization/Wrappers/VPK.cs
+++ b/SabreTools.Serialization/Wrappers/VPK.cs
@@ -111,7 +111,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/WAD.cs b/SabreTools.Serialization/Wrappers/WAD.cs
index 42ead404..011c435a 100644
--- a/SabreTools.Serialization/Wrappers/WAD.cs
+++ b/SabreTools.Serialization/Wrappers/WAD.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }
 
diff --git a/SabreTools.Serialization/Wrappers/XZP.cs b/SabreTools.Serialization/Wrappers/XZP.cs
index 8088c155..22bfe404 100644
--- a/SabreTools.Serialization/Wrappers/XZP.cs
+++ b/SabreTools.Serialization/Wrappers/XZP.cs
@@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Wrappers
                 return null;
 
             // Create a memory stream and use that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
+            var dataStream = new MemoryStream(data, offset, data.Length - offset);
             return Create(dataStream);
         }