diff --git a/SabreTools.DatFiles/Formats/ArchiveDotOrg.cs b/SabreTools.DatFiles/Formats/ArchiveDotOrg.cs
index c889c560..83fd1d29 100644
--- a/SabreTools.DatFiles/Formats/ArchiveDotOrg.cs
+++ b/SabreTools.DatFiles/Formats/ArchiveDotOrg.cs
@@ -11,8 +11,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public ArchiveDotOrg(DatFile? datFile)
-            : base(datFile)
+        public ArchiveDotOrg(DatFile? datFile) : base(datFile)
         {
         }
 
diff --git a/SabreTools.DatFiles/Formats/AttractMode.cs b/SabreTools.DatFiles/Formats/AttractMode.cs
index 1430ff0a..3e5648eb 100644
--- a/SabreTools.DatFiles/Formats/AttractMode.cs
+++ b/SabreTools.DatFiles/Formats/AttractMode.cs
@@ -12,8 +12,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public AttractMode(DatFile? datFile)
-            : base(datFile)
+        public AttractMode(DatFile? datFile) : base(datFile)
         {
         }
 
diff --git a/SabreTools.DatFiles/Formats/ClrMamePro.cs b/SabreTools.DatFiles/Formats/ClrMamePro.cs
index 480b7b58..a12a95b4 100644
--- a/SabreTools.DatFiles/Formats/ClrMamePro.cs
+++ b/SabreTools.DatFiles/Formats/ClrMamePro.cs
@@ -16,7 +16,7 @@ namespace SabreTools.DatFiles.Formats
         /// <summary>
         /// Get whether to assume quote usage on read and write or not
         /// </summary>
-        public bool Quotes { get; set; } = true;
+        private readonly bool _quotes;
 
         #endregion
 
@@ -25,10 +25,9 @@ namespace SabreTools.DatFiles.Formats
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
         /// <param name="quotes">Enable quotes on read and write, false otherwise</param>
-        public ClrMamePro(DatFile? datFile, bool quotes)
-            : base(datFile)
+        public ClrMamePro(DatFile? datFile, bool quotes) : base(datFile)
         {
-            Quotes = quotes;
+            _quotes = quotes;
         }
 
         /// <inheritdoc/>
@@ -37,7 +36,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 // Deserialize the input file
-                var metadataFile = Serialization.Deserializers.ClrMamePro.DeserializeFile(filename, this.Quotes);
+                var metadataFile = Serialization.Deserializers.ClrMamePro.DeserializeFile(filename, this._quotes);
                 var metadata = new Serialization.CrossModel.ClrMamePro().Serialize(metadataFile);
 
                 // Convert to the internal format
@@ -180,7 +179,7 @@ namespace SabreTools.DatFiles.Formats
                 // Serialize the input file
                 var metadata = ConvertMetadata(ignoreblanks);
                 var metadataFile = new Serialization.CrossModel.ClrMamePro().Deserialize(metadata);
-                if (!(Serialization.Serializers.ClrMamePro.SerializeFile(metadataFile, outfile, Quotes)))
+                if (!Serialization.Serializers.ClrMamePro.SerializeFile(metadataFile, outfile, _quotes))
                 {
                     logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
                     return false;
diff --git a/SabreTools.DatFiles/Formats/DosCenter.cs b/SabreTools.DatFiles/Formats/DosCenter.cs
index 901c69f6..eb3ba1cb 100644
--- a/SabreTools.DatFiles/Formats/DosCenter.cs
+++ b/SabreTools.DatFiles/Formats/DosCenter.cs
@@ -13,8 +13,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public DosCenter(DatFile? datFile)
-            : base(datFile)
+        public DosCenter(DatFile? datFile) : base(datFile)
         {
         }
 
diff --git a/SabreTools.DatFiles/Formats/EverdriveSmdb.cs b/SabreTools.DatFiles/Formats/EverdriveSmdb.cs
index 35257604..bb6ad796 100644
--- a/SabreTools.DatFiles/Formats/EverdriveSmdb.cs
+++ b/SabreTools.DatFiles/Formats/EverdriveSmdb.cs
@@ -13,8 +13,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public EverdriveSMDB(DatFile? datFile)
-            : base(datFile)
+        public EverdriveSMDB(DatFile? datFile) : base(datFile)
         {
         }
 
diff --git a/SabreTools.DatFiles/Formats/Hashfile.cs b/SabreTools.DatFiles/Formats/Hashfile.cs
index 1bfb3ef6..72fab736 100644
--- a/SabreTools.DatFiles/Formats/Hashfile.cs
+++ b/SabreTools.DatFiles/Formats/Hashfile.cs
@@ -18,8 +18,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public Hashfile(DatFile? datFile)
-            : base(datFile)
+        public Hashfile(DatFile? datFile) : base(datFile)
         {
         }
 
@@ -218,8 +217,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public SfvFile(DatFile? datFile)
-            : base(datFile)
+        public SfvFile(DatFile? datFile) : base(datFile)
         {
             _hash = HashType.CRC32;
         }
@@ -234,8 +232,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public Md5File(DatFile? datFile)
-            : base(datFile)
+        public Md5File(DatFile? datFile) : base(datFile)
         {
             _hash = HashType.MD5;
         }
@@ -250,8 +247,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public Sha1File(DatFile? datFile)
-            : base(datFile)
+        public Sha1File(DatFile? datFile) : base(datFile)
         {
             _hash = HashType.SHA1;
         }
@@ -266,8 +262,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public Sha256File(DatFile? datFile)
-            : base(datFile)
+        public Sha256File(DatFile? datFile) : base(datFile)
         {
             _hash = HashType.SHA256;
         }
@@ -282,8 +277,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public Sha384File(DatFile? datFile)
-            : base(datFile)
+        public Sha384File(DatFile? datFile) : base(datFile)
         {
             _hash = HashType.SHA384;
         }
@@ -298,8 +292,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public Sha512File(DatFile? datFile)
-            : base(datFile)
+        public Sha512File(DatFile? datFile) : base(datFile)
         {
             _hash = HashType.SHA512;
         }
@@ -314,8 +307,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public SpamSumFile(DatFile? datFile)
-            : base(datFile)
+        public SpamSumFile(DatFile? datFile) : base(datFile)
         {
             _hash = HashType.SpamSum;
         }
diff --git a/SabreTools.DatFiles/Formats/Listrom.cs b/SabreTools.DatFiles/Formats/Listrom.cs
index df822e73..0cd1e80e 100644
--- a/SabreTools.DatFiles/Formats/Listrom.cs
+++ b/SabreTools.DatFiles/Formats/Listrom.cs
@@ -13,8 +13,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public Listrom(DatFile? datFile)
-            : base(datFile)
+        public Listrom(DatFile? datFile) : base(datFile)
         {
         }
 
diff --git a/SabreTools.DatFiles/Formats/Listxml.cs b/SabreTools.DatFiles/Formats/Listxml.cs
index a2f8999f..6aa8c6d3 100644
--- a/SabreTools.DatFiles/Formats/Listxml.cs
+++ b/SabreTools.DatFiles/Formats/Listxml.cs
@@ -181,8 +181,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public Listxml(DatFile? datFile)
-            : base(datFile)
+        public Listxml(DatFile? datFile) : base(datFile)
         {
         }
 
diff --git a/SabreTools.DatFiles/Formats/Logiqx.cs b/SabreTools.DatFiles/Formats/Logiqx.cs
index bfa3665c..deb67968 100644
--- a/SabreTools.DatFiles/Formats/Logiqx.cs
+++ b/SabreTools.DatFiles/Formats/Logiqx.cs
@@ -225,8 +225,7 @@ namespace SabreTools.DatFiles.Formats
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
         /// <param name="deprecated">True if the output uses "game", false if the output uses "machine"</param>
-        public Logiqx(DatFile? datFile, bool deprecated)
-            : base(datFile)
+        public Logiqx(DatFile? datFile, bool deprecated) : base(datFile)
         {
             _deprecated = deprecated;
         }
@@ -353,7 +352,7 @@ namespace SabreTools.DatFiles.Formats
 
                 // Serialize the input file
                 var metadata = ConvertMetadata(ignoreblanks);
-                var datafile = new Serialization.CrossModel.Logiqx().Deserialize(metadata);
+                var datafile = new Serialization.CrossModel.Logiqx().Deserialize(metadata, _deprecated);
 
                 // TODO: Reenable doctype writing
                 // Only write the doctype if we don't have No-Intro data
diff --git a/SabreTools.DatFiles/Formats/Missfile.cs b/SabreTools.DatFiles/Formats/Missfile.cs
index 57ec78e9..6b857e2b 100644
--- a/SabreTools.DatFiles/Formats/Missfile.cs
+++ b/SabreTools.DatFiles/Formats/Missfile.cs
@@ -16,8 +16,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public Missfile(DatFile? datFile)
-            : base(datFile)
+        public Missfile(DatFile? datFile) : base(datFile)
         {
         }
 
diff --git a/SabreTools.DatFiles/Formats/OfflineList.cs b/SabreTools.DatFiles/Formats/OfflineList.cs
index 9c0a84a2..74a56c65 100644
--- a/SabreTools.DatFiles/Formats/OfflineList.cs
+++ b/SabreTools.DatFiles/Formats/OfflineList.cs
@@ -13,8 +13,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public OfflineList(DatFile? datFile)
-            : base(datFile)
+        public OfflineList(DatFile? datFile) : base(datFile)
         {
         }
 
diff --git a/SabreTools.DatFiles/Formats/OpenMSX.cs b/SabreTools.DatFiles/Formats/OpenMSX.cs
index 2de67f4c..97ffde6b 100644
--- a/SabreTools.DatFiles/Formats/OpenMSX.cs
+++ b/SabreTools.DatFiles/Formats/OpenMSX.cs
@@ -44,8 +44,7 @@ The softwaredb.xml file contains information about rom mapper types
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public OpenMSX(DatFile? datFile)
-            : base(datFile)
+        public OpenMSX(DatFile? datFile) : base(datFile)
         {
         }
 
diff --git a/SabreTools.DatFiles/Formats/RomCenter.cs b/SabreTools.DatFiles/Formats/RomCenter.cs
index 64465198..c51ae363 100644
--- a/SabreTools.DatFiles/Formats/RomCenter.cs
+++ b/SabreTools.DatFiles/Formats/RomCenter.cs
@@ -13,8 +13,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public RomCenter(DatFile? datFile)
-            : base(datFile)
+        public RomCenter(DatFile? datFile) : base(datFile)
         {
         }
 
diff --git a/SabreTools.DatFiles/Formats/SabreJSON.cs b/SabreTools.DatFiles/Formats/SabreJSON.cs
index f1db9e4b..26ea7f8b 100644
--- a/SabreTools.DatFiles/Formats/SabreJSON.cs
+++ b/SabreTools.DatFiles/Formats/SabreJSON.cs
@@ -22,8 +22,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public SabreJSON(DatFile? datFile)
-            : base(datFile)
+        public SabreJSON(DatFile? datFile) : base(datFile)
         {
         }
 
diff --git a/SabreTools.DatFiles/Formats/SabreXML.cs b/SabreTools.DatFiles/Formats/SabreXML.cs
index 26bffbf4..20b82925 100644
--- a/SabreTools.DatFiles/Formats/SabreXML.cs
+++ b/SabreTools.DatFiles/Formats/SabreXML.cs
@@ -18,8 +18,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public SabreXML(DatFile? datFile)
-            : base(datFile)
+        public SabreXML(DatFile? datFile) : base(datFile)
         {
         }
 
diff --git a/SabreTools.DatFiles/Formats/SeparatedValue.cs b/SabreTools.DatFiles/Formats/SeparatedValue.cs
index 792e246e..ccf783be 100644
--- a/SabreTools.DatFiles/Formats/SeparatedValue.cs
+++ b/SabreTools.DatFiles/Formats/SeparatedValue.cs
@@ -17,8 +17,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public SeparatedValue(DatFile? datFile)
-            : base(datFile)
+        public SeparatedValue(DatFile? datFile) : base(datFile)
         {
         }
 
@@ -126,8 +125,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public CommaSeparatedValue(DatFile? datFile)
-            : base(datFile)
+        public CommaSeparatedValue(DatFile? datFile) : base(datFile)
         {
             _delim = ',';
         }
@@ -142,8 +140,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public SemicolonSeparatedValue(DatFile? datFile)
-            : base(datFile)
+        public SemicolonSeparatedValue(DatFile? datFile) : base(datFile)
         {
             _delim = ';';
         }
@@ -158,8 +155,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public TabSeparatedValue(DatFile? datFile)
-            : base(datFile)
+        public TabSeparatedValue(DatFile? datFile) : base(datFile)
         {
             _delim = '\t';
         }
diff --git a/SabreTools.DatFiles/Formats/SoftwareList.cs b/SabreTools.DatFiles/Formats/SoftwareList.cs
index b8e996ee..ba1a9c94 100644
--- a/SabreTools.DatFiles/Formats/SoftwareList.cs
+++ b/SabreTools.DatFiles/Formats/SoftwareList.cs
@@ -75,8 +75,7 @@ namespace SabreTools.DatFiles.Formats
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public SoftwareList(DatFile? datFile)
-            : base(datFile)
+        public SoftwareList(DatFile? datFile) : base(datFile)
         {
         }