diff --git a/SabreTools.DatItems/Formats/Adjuster.cs b/SabreTools.DatItems/Formats/Adjuster.cs
index edfc44e6..abb0cd00 100644
--- a/SabreTools.DatItems/Formats/Adjuster.cs
+++ b/SabreTools.DatItems/Formats/Adjuster.cs
@@ -51,9 +51,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create an Adjuster object from the internal model
         /// </summary>
-        public Adjuster(Models.Metadata.Adjuster? item)
+        public Adjuster(Models.Metadata.Adjuster item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Adjuster);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Analog.cs b/SabreTools.DatItems/Formats/Analog.cs
index 16900687..5fb6f73d 100644
--- a/SabreTools.DatItems/Formats/Analog.cs
+++ b/SabreTools.DatItems/Formats/Analog.cs
@@ -26,9 +26,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create an Analog object from the internal model
         /// </summary>
-        public Analog(Models.Metadata.Analog? item)
+        public Analog(Models.Metadata.Analog item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Analog);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Archive.cs b/SabreTools.DatItems/Formats/Archive.cs
index 568bec26..07a79e18 100644
--- a/SabreTools.DatItems/Formats/Archive.cs
+++ b/SabreTools.DatItems/Formats/Archive.cs
@@ -106,9 +106,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create an Archive object from the internal model
         /// </summary>
-        public Archive(Models.Metadata.Archive? item)
+        public Archive(Models.Metadata.Archive item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Archive);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/BiosSet.cs b/SabreTools.DatItems/Formats/BiosSet.cs
index fbc3f514..4546084d 100644
--- a/SabreTools.DatItems/Formats/BiosSet.cs
+++ b/SabreTools.DatItems/Formats/BiosSet.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a BiosSet object from the internal model
         /// </summary>
-        public BiosSet(Models.Metadata.BiosSet? item)
+        public BiosSet(Models.Metadata.BiosSet item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.BiosSet);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Chip.cs b/SabreTools.DatItems/Formats/Chip.cs
index 229ea3c8..b9de0ad6 100644
--- a/SabreTools.DatItems/Formats/Chip.cs
+++ b/SabreTools.DatItems/Formats/Chip.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Chip object from the internal model
         /// </summary>
-        public Chip(Models.Metadata.Chip? item)
+        public Chip(Models.Metadata.Chip item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Chip);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Condition.cs b/SabreTools.DatItems/Formats/Condition.cs
index 83e62287..a93f8d10 100644
--- a/SabreTools.DatItems/Formats/Condition.cs
+++ b/SabreTools.DatItems/Formats/Condition.cs
@@ -26,9 +26,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Condition object from the internal model
         /// </summary>
-        public Condition(Models.Metadata.Condition? item)
+        public Condition(Models.Metadata.Condition item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Condition);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/ConfLocation.cs b/SabreTools.DatItems/Formats/ConfLocation.cs
index 28bbccfa..09f4c7d0 100644
--- a/SabreTools.DatItems/Formats/ConfLocation.cs
+++ b/SabreTools.DatItems/Formats/ConfLocation.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a ConfLocation object from the internal model
         /// </summary>
-        public ConfLocation(Models.Metadata.ConfLocation? item)
+        public ConfLocation(Models.Metadata.ConfLocation item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.ConfLocation);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/ConfSetting.cs b/SabreTools.DatItems/Formats/ConfSetting.cs
index b29ec9b3..904ae5a1 100644
--- a/SabreTools.DatItems/Formats/ConfSetting.cs
+++ b/SabreTools.DatItems/Formats/ConfSetting.cs
@@ -51,9 +51,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a ConfSetting object from the internal model
         /// </summary>
-        public ConfSetting(Models.Metadata.ConfSetting? item)
+        public ConfSetting(Models.Metadata.ConfSetting item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.ConfSetting);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Configuration.cs b/SabreTools.DatItems/Formats/Configuration.cs
index 80639ee9..be9c5533 100644
--- a/SabreTools.DatItems/Formats/Configuration.cs
+++ b/SabreTools.DatItems/Formats/Configuration.cs
@@ -71,9 +71,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Configuration object from the internal model
         /// </summary>
-        public Configuration(Models.Metadata.Configuration? item)
+        public Configuration(Models.Metadata.Configuration item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Configuration);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Control.cs b/SabreTools.DatItems/Formats/Control.cs
index 854e9d8f..584f5c62 100644
--- a/SabreTools.DatItems/Formats/Control.cs
+++ b/SabreTools.DatItems/Formats/Control.cs
@@ -26,9 +26,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Control object from the internal model
         /// </summary>
-        public Control(Models.Metadata.Control? item)
+        public Control(Models.Metadata.Control item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Control);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/DataArea.cs b/SabreTools.DatItems/Formats/DataArea.cs
index 2a7394cf..be002297 100644
--- a/SabreTools.DatItems/Formats/DataArea.cs
+++ b/SabreTools.DatItems/Formats/DataArea.cs
@@ -38,9 +38,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a DataArea object from the internal model
         /// </summary>
-        public DataArea(Models.Metadata.DataArea? item)
+        public DataArea(Models.Metadata.DataArea item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.DataArea);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Device.cs b/SabreTools.DatItems/Formats/Device.cs
index e4a2816c..0fe77eea 100644
--- a/SabreTools.DatItems/Formats/Device.cs
+++ b/SabreTools.DatItems/Formats/Device.cs
@@ -50,9 +50,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Device object from the internal model
         /// </summary>
-        public Device(Models.Metadata.Device? item)
+        public Device(Models.Metadata.Device item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Device);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/DeviceReference.cs b/SabreTools.DatItems/Formats/DeviceReference.cs
index 444dad85..11b7e24d 100644
--- a/SabreTools.DatItems/Formats/DeviceReference.cs
+++ b/SabreTools.DatItems/Formats/DeviceReference.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a DeviceReference object from the internal model
         /// </summary>
-        public DeviceReference(Models.Metadata.DeviceRef? item)
+        public DeviceReference(Models.Metadata.DeviceRef item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.DeviceReference);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/DipLocation.cs b/SabreTools.DatItems/Formats/DipLocation.cs
index b99e8245..e7a84aa0 100644
--- a/SabreTools.DatItems/Formats/DipLocation.cs
+++ b/SabreTools.DatItems/Formats/DipLocation.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a DipLocation object from the internal model
         /// </summary>
-        public DipLocation(Models.Metadata.DipLocation? item)
+        public DipLocation(Models.Metadata.DipLocation item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.DipLocation);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/DipSwitch.cs b/SabreTools.DatItems/Formats/DipSwitch.cs
index 015da37f..18508e31 100644
--- a/SabreTools.DatItems/Formats/DipSwitch.cs
+++ b/SabreTools.DatItems/Formats/DipSwitch.cs
@@ -92,9 +92,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a DipSwitch object from the internal model
         /// </summary>
-        public DipSwitch(Models.Metadata.DipSwitch? item)
+        public DipSwitch(Models.Metadata.DipSwitch item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.DipSwitch);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/DipValue.cs b/SabreTools.DatItems/Formats/DipValue.cs
index a4b98223..efe471df 100644
--- a/SabreTools.DatItems/Formats/DipValue.cs
+++ b/SabreTools.DatItems/Formats/DipValue.cs
@@ -51,9 +51,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a DipValue object from the internal model
         /// </summary>
-        public DipValue(Models.Metadata.DipValue? item)
+        public DipValue(Models.Metadata.DipValue item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.DipValue);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Disk.cs b/SabreTools.DatItems/Formats/Disk.cs
index 52d92028..ad2efc83 100644
--- a/SabreTools.DatItems/Formats/Disk.cs
+++ b/SabreTools.DatItems/Formats/Disk.cs
@@ -98,9 +98,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Disk object from the internal model
         /// </summary>
-        public Disk(Models.Metadata.Disk? item)
+        public Disk(Models.Metadata.Disk item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Disk);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
@@ -139,7 +139,7 @@ namespace SabreTools.DatItems.Formats
         /// <returns></returns>
         public Rom ConvertToRom()
         {
-            var rom = new Rom(_internal.ConvertToRom());
+            var rom = new Rom(_internal.ConvertToRom()!);
             rom.GetFieldValue<DataArea?>(Rom.DataAreaKey)?.SetName(this.GetFieldValue<DiskArea?>(Disk.DiskAreaKey)?.GetName());
             rom.SetFieldValue<DupeType>(DatItem.DupeTypeKey, GetFieldValue<DupeType>(DatItem.DupeTypeKey));
             rom.SetFieldValue<Machine>(DatItem.MachineKey, GetFieldValue<Machine>(DatItem.MachineKey)!.Clone() as Machine ?? new Machine());
diff --git a/SabreTools.DatItems/Formats/DiskArea.cs b/SabreTools.DatItems/Formats/DiskArea.cs
index b6462a78..251c2054 100644
--- a/SabreTools.DatItems/Formats/DiskArea.cs
+++ b/SabreTools.DatItems/Formats/DiskArea.cs
@@ -38,9 +38,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a DiskArea object from the internal model
         /// </summary>
-        public DiskArea(Models.Metadata.DiskArea? item)
+        public DiskArea(Models.Metadata.DiskArea item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.DiskArea);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Display.cs b/SabreTools.DatItems/Formats/Display.cs
index 186a3667..52762b98 100644
--- a/SabreTools.DatItems/Formats/Display.cs
+++ b/SabreTools.DatItems/Formats/Display.cs
@@ -26,9 +26,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Display object from the internal model
         /// </summary>
-        public Display(Models.Metadata.Display? item)
+        public Display(Models.Metadata.Display item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Display);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
@@ -37,10 +37,10 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Display object from the internal model
         /// </summary>
-        public Display(Models.Metadata.Video? item)
+        public Display(Models.Metadata.Video item)
         {
             // TODO: Determine what transformation is needed here
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Display);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Driver.cs b/SabreTools.DatItems/Formats/Driver.cs
index b4684a3a..251335bd 100644
--- a/SabreTools.DatItems/Formats/Driver.cs
+++ b/SabreTools.DatItems/Formats/Driver.cs
@@ -29,9 +29,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Driver object from the internal model
         /// </summary>
-        public Driver(Models.Metadata.Driver? item)
+        public Driver(Models.Metadata.Driver item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Driver);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Extension.cs b/SabreTools.DatItems/Formats/Extension.cs
index 916cbc8e..b2dbfde5 100644
--- a/SabreTools.DatItems/Formats/Extension.cs
+++ b/SabreTools.DatItems/Formats/Extension.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create an Extension object from the internal model
         /// </summary>
-        public Extension(Models.Metadata.Extension? item)
+        public Extension(Models.Metadata.Extension item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Extension);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Feature.cs b/SabreTools.DatItems/Formats/Feature.cs
index 6350b625..f0013820 100644
--- a/SabreTools.DatItems/Formats/Feature.cs
+++ b/SabreTools.DatItems/Formats/Feature.cs
@@ -26,9 +26,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Feature object from the internal model
         /// </summary>
-        public Feature(Models.Metadata.Feature? item)
+        public Feature(Models.Metadata.Feature item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Feature);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Info.cs b/SabreTools.DatItems/Formats/Info.cs
index 55b19728..6097cf6b 100644
--- a/SabreTools.DatItems/Formats/Info.cs
+++ b/SabreTools.DatItems/Formats/Info.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create an Info object from the internal model
         /// </summary>
-        public Info(Models.Metadata.Info? item)
+        public Info(Models.Metadata.Info item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Info);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Input.cs b/SabreTools.DatItems/Formats/Input.cs
index 9202bf39..640dc1ff 100644
--- a/SabreTools.DatItems/Formats/Input.cs
+++ b/SabreTools.DatItems/Formats/Input.cs
@@ -40,9 +40,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create an Input object from the internal model
         /// </summary>
-        public Input(Models.Metadata.Input? item)
+        public Input(Models.Metadata.Input item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Input);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Instance.cs b/SabreTools.DatItems/Formats/Instance.cs
index a62315f1..b8e8be9f 100644
--- a/SabreTools.DatItems/Formats/Instance.cs
+++ b/SabreTools.DatItems/Formats/Instance.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create an Instance object from the internal model
         /// </summary>
-        public Instance(Models.Metadata.Instance? item)
+        public Instance(Models.Metadata.Instance item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Instance);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Media.cs b/SabreTools.DatItems/Formats/Media.cs
index 4dd78629..e21de2cc 100644
--- a/SabreTools.DatItems/Formats/Media.cs
+++ b/SabreTools.DatItems/Formats/Media.cs
@@ -40,9 +40,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Media object from the internal model
         /// </summary>
-        public Media(Models.Metadata.Media? item)
+        public Media(Models.Metadata.Media item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Media);
             SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
@@ -103,7 +103,7 @@ namespace SabreTools.DatItems.Formats
         /// <returns></returns>
         public Rom ConvertToRom()
         {
-            var rom = new Rom(_internal.ConvertToRom());
+            var rom = new Rom(_internal.ConvertToRom()!);
             rom.SetFieldValue<DupeType>(DatItem.DupeTypeKey, GetFieldValue<DupeType>(DatItem.DupeTypeKey));
             rom.SetFieldValue<Machine>(DatItem.MachineKey, GetFieldValue<Machine>(DatItem.MachineKey));
             rom.SetFieldValue<bool>(DatItem.RemoveKey, GetFieldValue<bool>(DatItem.RemoveKey));
diff --git a/SabreTools.DatItems/Formats/Part.cs b/SabreTools.DatItems/Formats/Part.cs
index faf36f18..0deb4da6 100644
--- a/SabreTools.DatItems/Formats/Part.cs
+++ b/SabreTools.DatItems/Formats/Part.cs
@@ -52,9 +52,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Part object from the internal model
         /// </summary>
-        public Part(Models.Metadata.Part? item)
+        public Part(Models.Metadata.Part item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Part);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/PartFeature.cs b/SabreTools.DatItems/Formats/PartFeature.cs
index e7105882..bf2ae0e8 100644
--- a/SabreTools.DatItems/Formats/PartFeature.cs
+++ b/SabreTools.DatItems/Formats/PartFeature.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a PartFeature object from the internal model
         /// </summary>
-        public PartFeature(Models.Metadata.Feature? item)
+        public PartFeature(Models.Metadata.Feature item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.PartFeature);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Port.cs b/SabreTools.DatItems/Formats/Port.cs
index 038095da..00d9c678 100644
--- a/SabreTools.DatItems/Formats/Port.cs
+++ b/SabreTools.DatItems/Formats/Port.cs
@@ -40,9 +40,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Port object from the internal model
         /// </summary>
-        public Port(Models.Metadata.Port? item)
+        public Port(Models.Metadata.Port item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Port);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/RamOption.cs b/SabreTools.DatItems/Formats/RamOption.cs
index e4145c1b..2d9dca24 100644
--- a/SabreTools.DatItems/Formats/RamOption.cs
+++ b/SabreTools.DatItems/Formats/RamOption.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a RamOption object from the internal model
         /// </summary>
-        public RamOption(Models.Metadata.RamOption? item)
+        public RamOption(Models.Metadata.RamOption item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.RamOption);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Release.cs b/SabreTools.DatItems/Formats/Release.cs
index c9dffd69..c2ad263e 100644
--- a/SabreTools.DatItems/Formats/Release.cs
+++ b/SabreTools.DatItems/Formats/Release.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Release object from the internal model
         /// </summary>
-        public Release(Models.Metadata.Release? item)
+        public Release(Models.Metadata.Release item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Release);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Rom.cs b/SabreTools.DatItems/Formats/Rom.cs
index 6a87aa2b..2bd830e6 100644
--- a/SabreTools.DatItems/Formats/Rom.cs
+++ b/SabreTools.DatItems/Formats/Rom.cs
@@ -149,9 +149,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Rom object from the internal model
         /// </summary>
-        public Rom(Models.Metadata.Rom? item)
+        public Rom(Models.Metadata.Rom item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Rom);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Sample.cs b/SabreTools.DatItems/Formats/Sample.cs
index bdd937a7..5d8fd091 100644
--- a/SabreTools.DatItems/Formats/Sample.cs
+++ b/SabreTools.DatItems/Formats/Sample.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Sample object from the internal model
         /// </summary>
-        public Sample(Models.Metadata.Sample? item)
+        public Sample(Models.Metadata.Sample item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Sample);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/SharedFeature.cs b/SabreTools.DatItems/Formats/SharedFeature.cs
index c46f101b..4a08ba8b 100644
--- a/SabreTools.DatItems/Formats/SharedFeature.cs
+++ b/SabreTools.DatItems/Formats/SharedFeature.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a SharedFeature object from the internal model
         /// </summary>
-        public SharedFeature(Models.Metadata.SharedFeat? item)
+        public SharedFeature(Models.Metadata.SharedFeat item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.SharedFeature);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Slot.cs b/SabreTools.DatItems/Formats/Slot.cs
index 7c898e79..84011997 100644
--- a/SabreTools.DatItems/Formats/Slot.cs
+++ b/SabreTools.DatItems/Formats/Slot.cs
@@ -51,9 +51,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Slot object from the internal model
         /// </summary>
-        public Slot(Models.Metadata.Slot? item)
+        public Slot(Models.Metadata.Slot item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Slot);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/SlotOption.cs b/SabreTools.DatItems/Formats/SlotOption.cs
index b59f23d5..6d477f21 100644
--- a/SabreTools.DatItems/Formats/SlotOption.cs
+++ b/SabreTools.DatItems/Formats/SlotOption.cs
@@ -37,9 +37,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a SlotOption object from the internal model
         /// </summary>
-        public SlotOption(Models.Metadata.SlotOption? item)
+        public SlotOption(Models.Metadata.SlotOption item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.SlotOption);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/SoftwareList.cs b/SabreTools.DatItems/Formats/SoftwareList.cs
index 977a1c96..e702f156 100644
--- a/SabreTools.DatItems/Formats/SoftwareList.cs
+++ b/SabreTools.DatItems/Formats/SoftwareList.cs
@@ -40,9 +40,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a SoftwareList object from the internal model
         /// </summary>
-        public SoftwareList(Models.Metadata.SoftwareList? item)
+        public SoftwareList(Models.Metadata.SoftwareList item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.SoftwareList);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());
diff --git a/SabreTools.DatItems/Formats/Sound.cs b/SabreTools.DatItems/Formats/Sound.cs
index 9698b540..5d06d395 100644
--- a/SabreTools.DatItems/Formats/Sound.cs
+++ b/SabreTools.DatItems/Formats/Sound.cs
@@ -26,9 +26,9 @@ namespace SabreTools.DatItems.Formats
         /// <summary>
         /// Create a Sound object from the internal model
         /// </summary>
-        public Sound(Models.Metadata.Sound? item)
+        public Sound(Models.Metadata.Sound item)
         {
-            _internal = item ?? [];
+            _internal = item;
 
             SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, ItemType.Sound);
             SetFieldValue<Machine>(DatItem.MachineKey, new Machine());