diff --git a/SabreTools.DatFiles/DatFile.FromMetadata.cs b/SabreTools.DatFiles/DatFile.FromMetadata.cs
index 5ad35d34..332dfe02 100644
--- a/SabreTools.DatFiles/DatFile.FromMetadata.cs
+++ b/SabreTools.DatFiles/DatFile.FromMetadata.cs
@@ -74,11 +74,7 @@ namespace SabreTools.DatFiles
             {
                 var newDat = item.Read<Models.OfflineList.NewDat>(Models.Metadata.Header.NewDatKey);
                 if (newDat != null)
-                {
-                    Header.SetFieldValue<string?>("DATVERSIONURL", newDat.DatVersionUrl);
-                    Header.SetFieldValue<Models.OfflineList.DatUrl?>("DATURL", newDat.DatUrl);
-                    Header.SetFieldValue<string?>("IMURL", newDat.ImUrl);
-                }
+                    Header.SetFieldValue<Models.OfflineList.NewDat?>(Models.Metadata.Header.NewDatKey, newDat);
             }
             if (item.ContainsKey(Models.Metadata.Header.SearchKey))
             {
diff --git a/SabreTools.DatFiles/DatFile.ToMetadata.cs b/SabreTools.DatFiles/DatFile.ToMetadata.cs
index 49502075..6521d285 100644
--- a/SabreTools.DatFiles/DatFile.ToMetadata.cs
+++ b/SabreTools.DatFiles/DatFile.ToMetadata.cs
@@ -87,15 +87,7 @@ namespace SabreTools.DatFiles
             if (Header.InfosSpecified)
                 header[Models.Metadata.Header.InfosKey] = Header.GetFieldValue<Models.OfflineList.Infos>(Models.Metadata.Header.InfosKey);
             if (Header.NewDatSpecified)
-            {
-                var newDat = new Models.OfflineList.NewDat
-                {
-                    DatVersionUrl = Header.GetStringFieldValue("DATVERSIONURL"),
-                    DatUrl = Header.GetFieldValue<Models.OfflineList.DatUrl?>("DATURL"),
-                    ImUrl = Header.GetStringFieldValue("IMURL"),
-                };
-                header[Models.Metadata.Header.NewDatKey] = newDat;
-            }
+                header[Models.Metadata.Header.NewDatKey] = Header.GetFieldValue<Models.OfflineList.NewDat>(Models.Metadata.Header.NewDatKey);
             if (Header.SearchSpecified)
                 header[Models.Metadata.Header.SearchKey] = Header.GetFieldValue<Models.OfflineList.Search>(Models.Metadata.Header.SearchKey);
 
diff --git a/SabreTools.DatFiles/DatHeader.cs b/SabreTools.DatFiles/DatHeader.cs
index 03bc4a57..c712099c 100644
--- a/SabreTools.DatFiles/DatHeader.cs
+++ b/SabreTools.DatFiles/DatHeader.cs
@@ -106,8 +106,7 @@ namespace SabreTools.DatFiles
         {
             get
             {
-                var infos = GetFieldValue<Models.OfflineList.InfoBase[]?>(Models.Metadata.Header.InfosKey);
-                return infos != null && infos.Length > 0;
+                return GetFieldValue<Models.OfflineList.Infos?>(Models.Metadata.Header.InfosKey) != null;
             }
         }
 
@@ -116,9 +115,7 @@ namespace SabreTools.DatFiles
         {
             get
             {
-                return GetStringFieldValue("DATVERSIONURL") != null
-                    && GetFieldValue<Models.OfflineList.DatUrl?>("DATURL") != null
-                    && GetStringFieldValue("IMURL") != null;
+                return GetFieldValue<Models.OfflineList.NewDat?>(Models.Metadata.Header.NewDatKey) != null;
             }
         }