diff --git a/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs b/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs
index 76d50745..e7c86d78 100644
--- a/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs
+++ b/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs
@@ -23,7 +23,7 @@ namespace SabreTools.Data.Extensions.Test
             Rom? actual = self.ConvertToRom();
 
             Assert.NotNull(actual);
-            Assert.Equal(8, actual.Count);
+            Assert.Equal(7, actual.Count);
             Assert.Equal(ItemType.Rom, actual.ItemType);
             Assert.Null(actual[Rom.NameKey]);
             Assert.Null(actual[Rom.MergeKey]);
@@ -51,7 +51,7 @@ namespace SabreTools.Data.Extensions.Test
             Rom? actual = self.ConvertToRom();
 
             Assert.NotNull(actual);
-            Assert.Equal(8, actual.Count);
+            Assert.Equal(7, actual.Count);
             Assert.Equal(ItemType.Rom, actual.ItemType);
             Assert.Equal("XXXXXX.chd", actual[Rom.NameKey]);
             Assert.Equal("XXXXXX", actual[Rom.MergeKey]);
@@ -69,7 +69,7 @@ namespace SabreTools.Data.Extensions.Test
             Rom? actual = self.ConvertToRom();
 
             Assert.NotNull(actual);
-            Assert.Equal(6, actual.Count);
+            Assert.Equal(5, actual.Count);
             Assert.Equal(ItemType.Rom, actual.ItemType);
             Assert.Null(actual[Rom.NameKey]);
             Assert.Null(actual[Rom.MD5Key]);
@@ -93,7 +93,7 @@ namespace SabreTools.Data.Extensions.Test
             Rom? actual = self.ConvertToRom();
 
             Assert.NotNull(actual);
-            Assert.Equal(6, actual.Count);
+            Assert.Equal(5, actual.Count);
             Assert.Equal(ItemType.Rom, actual.ItemType);
             Assert.Equal("XXXXXX.aaruf", actual[Rom.NameKey]);
             Assert.Equal("XXXXXX", actual[Rom.MD5Key]);
diff --git a/SabreTools.Metadata.DatItems.Test/DatItemTests.cs b/SabreTools.Metadata.DatItems.Test/DatItemTests.cs
index df6b29cc..f80fa993 100644
--- a/SabreTools.Metadata.DatItems.Test/DatItemTests.cs
+++ b/SabreTools.Metadata.DatItems.Test/DatItemTests.cs
@@ -23,7 +23,7 @@ namespace SabreTools.Metadata.DatItems.Test
         {
             private readonly string? _nameKey;
 
-            internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Blank;
+            public override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Blank;
 
             public TestDatItem() => _nameKey = TestDatItemModel.NameKey;
 
diff --git a/SabreTools.Metadata.DatItems/DatItem.cs b/SabreTools.Metadata.DatItems/DatItem.cs
index 92d1e050..c61ef588 100644
--- a/SabreTools.Metadata.DatItems/DatItem.cs
+++ b/SabreTools.Metadata.DatItems/DatItem.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 using SabreTools.Data.Extensions;
@@ -85,7 +85,7 @@ namespace SabreTools.Metadata.DatItems
         /// <summary>
         /// Item type for the object
         /// </summary>
-        internal abstract Data.Models.Metadata.ItemType ItemType { get; }
+        public abstract Data.Models.Metadata.ItemType ItemType { get; }
 
         #endregion
 
diff --git a/SabreTools.Metadata.DatItems/DatItemT.cs b/SabreTools.Metadata.DatItems/DatItemT.cs
index 9859bc5f..f76bfe8f 100644
--- a/SabreTools.Metadata.DatItems/DatItemT.cs
+++ b/SabreTools.Metadata.DatItems/DatItemT.cs
@@ -8,6 +8,13 @@ namespace SabreTools.Metadata.DatItems
     /// </summary>
     public abstract class DatItem<T> : DatItem, IEquatable<DatItem<T>>, IComparable<DatItem<T>>, ICloneable where T : Data.Models.Metadata.DatItem, new()
     {
+        #region Fields
+
+        /// <inheritdoc>/>
+        public override Data.Models.Metadata.ItemType ItemType => _internal.ItemType;
+
+        #endregion
+
         #region Constructors
 
         /// <summary>
diff --git a/SabreTools.Metadata.DatItems/Formats/Adjuster.cs b/SabreTools.Metadata.DatItems/Formats/Adjuster.cs
index 71f951f4..fef67fbb 100644
--- a/SabreTools.Metadata.DatItems/Formats/Adjuster.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Adjuster.cs
@@ -12,9 +12,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     {
         #region Fields
 
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Adjuster;
-
         [JsonIgnore]
         public bool ConditionsSpecified
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Analog.cs b/SabreTools.Metadata.DatItems/Formats/Analog.cs
index b2c8f80e..8338418d 100644
--- a/SabreTools.Metadata.DatItems/Formats/Analog.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Analog.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("analog"), XmlRoot("analog")]
     public sealed class Analog : DatItem<Data.Models.Metadata.Analog>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Analog;
-
-        #endregion
-
         #region Constructors
 
         public Analog() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Archive.cs b/SabreTools.Metadata.DatItems/Formats/Archive.cs
index 98640cb4..d227eb50 100644
--- a/SabreTools.Metadata.DatItems/Formats/Archive.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Archive.cs
@@ -10,80 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("archive"), XmlRoot("archive")]
     public sealed class Archive : DatItem<Data.Models.Metadata.Archive>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Archive;
-
-        // TODO: None of the following are used or checked
-
-        /// <summary>
-        /// Archive ID number
-        /// </summary>
-        /// <remarks>TODO: No-Intro database export only</remarks>
-        [JsonProperty("number"), XmlElement("number")]
-        public string? Number { get; set; }
-
-        /// <summary>
-        /// Clone value
-        /// </summary>
-        /// <remarks>TODO: No-Intro database export only</remarks>
-        [JsonProperty("clone"), XmlElement("clone")]
-        public string? CloneValue { get; set; }
-
-        /// <summary>
-        /// Regional parent value
-        /// </summary>
-        /// <remarks>TODO: No-Intro database export only</remarks>
-        [JsonProperty("regparent"), XmlElement("regparent")]
-        public string? RegParent { get; set; }
-
-        /// <summary>
-        /// Region value
-        /// </summary>
-        /// <remarks>TODO: No-Intro database export only</remarks>
-        [JsonProperty("region"), XmlElement("region")]
-        public string? Region { get; set; }
-
-        /// <summary>
-        /// Languages value
-        /// </summary>
-        /// <remarks>TODO: No-Intro database export only</remarks>
-        [JsonProperty("languages"), XmlElement("languages")]
-        public string? Languages { get; set; }
-
-        /// <summary>
-        /// Development status value
-        /// </summary>
-        /// <remarks>TODO: No-Intro database export only</remarks>
-        [JsonProperty("devstatus"), XmlElement("devstatus")]
-        public string? DevStatus { get; set; }
-
-        /// <summary>
-        /// Physical value
-        /// </summary>
-        /// <remarks>TODO: No-Intro database export only</remarks>
-        /// <remarks>TODO: Is this numeric or a flag?</remarks>
-        [JsonProperty("physical"), XmlElement("physical")]
-        public string? Physical { get; set; }
-
-        /// <summary>
-        /// Complete value
-        /// </summary>
-        /// <remarks>TODO: No-Intro database export only</remarks>
-        /// <remarks>TODO: Is this numeric or a flag?</remarks>
-        [JsonProperty("complete"), XmlElement("complete")]
-        public string? Complete { get; set; }
-
-        /// <summary>
-        /// Categories value
-        /// </summary>
-        /// <remarks>TODO: No-Intro database export only</remarks>
-        [JsonProperty("categories"), XmlElement("categories")]
-        public string? Categories { get; set; }
-
-        #endregion
-
         #region Constructors
 
         public Archive() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/BiosSet.cs b/SabreTools.Metadata.DatItems/Formats/BiosSet.cs
index ab93e366..395e59ca 100644
--- a/SabreTools.Metadata.DatItems/Formats/BiosSet.cs
+++ b/SabreTools.Metadata.DatItems/Formats/BiosSet.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("biosset"), XmlRoot("biosset")]
     public sealed class BiosSet : DatItem<Data.Models.Metadata.BiosSet>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.BiosSet;
-
-        #endregion
-
         #region Constructors
 
         public BiosSet() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Blank.cs b/SabreTools.Metadata.DatItems/Formats/Blank.cs
index 23c6e15f..e00521e7 100644
--- a/SabreTools.Metadata.DatItems/Formats/Blank.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Blank.cs
@@ -12,7 +12,7 @@ namespace SabreTools.Metadata.DatItems.Formats
         #region Fields
 
         /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Blank;
+        public override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Blank;
 
         #endregion
 
diff --git a/SabreTools.Metadata.DatItems/Formats/Chip.cs b/SabreTools.Metadata.DatItems/Formats/Chip.cs
index 391979a5..dd83cf93 100644
--- a/SabreTools.Metadata.DatItems/Formats/Chip.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Chip.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("chip"), XmlRoot("chip")]
     public sealed class Chip : DatItem<Data.Models.Metadata.Chip>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Chip;
-
-        #endregion
-
         #region Constructors
 
         public Chip() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Condition.cs b/SabreTools.Metadata.DatItems/Formats/Condition.cs
index 5af02f57..93157cc2 100644
--- a/SabreTools.Metadata.DatItems/Formats/Condition.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Condition.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("condition"), XmlRoot("condition")]
     public sealed class Condition : DatItem<Data.Models.Metadata.Condition>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Condition;
-
-        #endregion
-
         #region Constructors
 
         public Condition() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/ConfLocation.cs b/SabreTools.Metadata.DatItems/Formats/ConfLocation.cs
index 832331c4..34835759 100644
--- a/SabreTools.Metadata.DatItems/Formats/ConfLocation.cs
+++ b/SabreTools.Metadata.DatItems/Formats/ConfLocation.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("conflocation"), XmlRoot("conflocation")]
     public sealed class ConfLocation : DatItem<Data.Models.Metadata.ConfLocation>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.ConfLocation;
-
-        #endregion
-
         #region Constructors
 
         public ConfLocation() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs b/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs
index 2b8adac0..4fe81fe4 100644
--- a/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs
+++ b/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs
@@ -12,9 +12,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     {
         #region Fields
 
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.ConfSetting;
-
         [JsonIgnore]
         public bool ConditionsSpecified
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Configuration.cs b/SabreTools.Metadata.DatItems/Formats/Configuration.cs
index c27feb08..4d8e8525 100644
--- a/SabreTools.Metadata.DatItems/Formats/Configuration.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Configuration.cs
@@ -13,9 +13,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     {
         #region Fields
 
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Configuration;
-
         [JsonIgnore]
         public bool ConditionsSpecified
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Control.cs b/SabreTools.Metadata.DatItems/Formats/Control.cs
index 25febac4..b8840a00 100644
--- a/SabreTools.Metadata.DatItems/Formats/Control.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Control.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("control"), XmlRoot("control")]
     public sealed class Control : DatItem<Data.Models.Metadata.Control>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Control;
-
-        #endregion
-
         #region Constructors
 
         public Control() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/DataArea.cs b/SabreTools.Metadata.DatItems/Formats/DataArea.cs
index c9cb7546..1dd9191e 100644
--- a/SabreTools.Metadata.DatItems/Formats/DataArea.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DataArea.cs
@@ -11,13 +11,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("dataarea"), XmlRoot("dataarea")]
     public sealed class DataArea : DatItem<Data.Models.Metadata.DataArea>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.DataArea;
-
-        #endregion
-
         #region Constructors
 
         public DataArea() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Device.cs b/SabreTools.Metadata.DatItems/Formats/Device.cs
index a413868b..3c95b8d8 100644
--- a/SabreTools.Metadata.DatItems/Formats/Device.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Device.cs
@@ -13,9 +13,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     {
         #region Fields
 
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Device;
-
         [JsonIgnore]
         public bool InstancesSpecified
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/DeviceRef.cs b/SabreTools.Metadata.DatItems/Formats/DeviceRef.cs
index b3611c61..c74dedcb 100644
--- a/SabreTools.Metadata.DatItems/Formats/DeviceRef.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DeviceRef.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("device_ref"), XmlRoot("device_ref")]
     public sealed class DeviceRef : DatItem<Data.Models.Metadata.DeviceRef>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.DeviceRef;
-
-        #endregion
-
         #region Constructors
 
         public DeviceRef() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/DipLocation.cs b/SabreTools.Metadata.DatItems/Formats/DipLocation.cs
index 56efb857..207e4b14 100644
--- a/SabreTools.Metadata.DatItems/Formats/DipLocation.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DipLocation.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("diplocation"), XmlRoot("diplocation")]
     public sealed class DipLocation : DatItem<Data.Models.Metadata.DipLocation>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.DipLocation;
-
-        #endregion
-
         #region Constructors
 
         public DipLocation() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs b/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs
index 40caa877..db1053ef 100644
--- a/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs
@@ -22,9 +22,6 @@ namespace SabreTools.Metadata.DatItems.Formats
 
         #region Fields
 
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.DipSwitch;
-
         [JsonIgnore]
         public bool ConditionsSpecified
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/DipValue.cs b/SabreTools.Metadata.DatItems/Formats/DipValue.cs
index 206886ad..94600083 100644
--- a/SabreTools.Metadata.DatItems/Formats/DipValue.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DipValue.cs
@@ -12,9 +12,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     {
         #region Fields
 
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.DipValue;
-
         [JsonIgnore]
         public bool ConditionsSpecified
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Disk.cs b/SabreTools.Metadata.DatItems/Formats/Disk.cs
index fb1398b6..14cefd9d 100644
--- a/SabreTools.Metadata.DatItems/Formats/Disk.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Disk.cs
@@ -28,9 +28,6 @@ namespace SabreTools.Metadata.DatItems.Formats
 
         #region Fields
 
-        /// <inheritdoc>/>
-        internal override ItemType ItemType => ItemType.Disk;
-
         [JsonIgnore]
         public bool DiskAreaSpecified
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/DiskArea.cs b/SabreTools.Metadata.DatItems/Formats/DiskArea.cs
index 4f4061bd..3bda040b 100644
--- a/SabreTools.Metadata.DatItems/Formats/DiskArea.cs
+++ b/SabreTools.Metadata.DatItems/Formats/DiskArea.cs
@@ -11,13 +11,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("diskarea"), XmlRoot("diskarea")]
     public sealed class DiskArea : DatItem<Data.Models.Metadata.DiskArea>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.DiskArea;
-
-        #endregion
-
         #region Constructors
 
         public DiskArea() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Display.cs b/SabreTools.Metadata.DatItems/Formats/Display.cs
index e7ff0b0b..8921a2f6 100644
--- a/SabreTools.Metadata.DatItems/Formats/Display.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Display.cs
@@ -11,13 +11,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("display"), XmlRoot("display")]
     public sealed class Display : DatItem<Data.Models.Metadata.Display>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Display;
-
-        #endregion
-
         #region Constructors
 
         public Display() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Driver.cs b/SabreTools.Metadata.DatItems/Formats/Driver.cs
index 2fea004c..03a038bf 100644
--- a/SabreTools.Metadata.DatItems/Formats/Driver.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Driver.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("driver"), XmlRoot("driver")]
     public sealed class Driver : DatItem<Data.Models.Metadata.Driver>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Driver;
-
-        #endregion
-
         #region Constructors
 
         public Driver() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Extension.cs b/SabreTools.Metadata.DatItems/Formats/Extension.cs
index b11fd9e7..cd1a3c51 100644
--- a/SabreTools.Metadata.DatItems/Formats/Extension.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Extension.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("extension"), XmlRoot("extension")]
     public sealed class Extension : DatItem<Data.Models.Metadata.Extension>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Extension;
-
-        #endregion
-
         #region Constructors
 
         public Extension() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Feature.cs b/SabreTools.Metadata.DatItems/Formats/Feature.cs
index 735ae025..dea27133 100644
--- a/SabreTools.Metadata.DatItems/Formats/Feature.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Feature.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("feature"), XmlRoot("feature")]
     public sealed class Feature : DatItem<Data.Models.Metadata.Feature>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Feature;
-
-        #endregion
-
         #region Constructors
 
         public Feature() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/File.cs b/SabreTools.Metadata.DatItems/Formats/File.cs
index fd132ebd..4acc452b 100644
--- a/SabreTools.Metadata.DatItems/Formats/File.cs
+++ b/SabreTools.Metadata.DatItems/Formats/File.cs
@@ -27,7 +27,7 @@ namespace SabreTools.Metadata.DatItems.Formats
         #region Fields
 
         /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.File;
+        public override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.File;
 
         /// <summary>
         /// ID value
diff --git a/SabreTools.Metadata.DatItems/Formats/Info.cs b/SabreTools.Metadata.DatItems/Formats/Info.cs
index fe9421f2..1908073a 100644
--- a/SabreTools.Metadata.DatItems/Formats/Info.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Info.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("info"), XmlRoot("info")]
     public sealed class Info : DatItem<Data.Models.Metadata.Info>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Info;
-
-        #endregion
-
         #region Constructors
 
         public Info() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Input.cs b/SabreTools.Metadata.DatItems/Formats/Input.cs
index 811e5daf..2b71950f 100644
--- a/SabreTools.Metadata.DatItems/Formats/Input.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Input.cs
@@ -13,9 +13,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     {
         #region Fields
 
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Input;
-
         [JsonIgnore]
         public bool ControlsSpecified
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Instance.cs b/SabreTools.Metadata.DatItems/Formats/Instance.cs
index 3ac50eca..b50addd5 100644
--- a/SabreTools.Metadata.DatItems/Formats/Instance.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Instance.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("instance"), XmlRoot("instance")]
     public sealed class Instance : DatItem<Data.Models.Metadata.Instance>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Instance;
-
-        #endregion
-
         #region Constructors
 
         public Instance() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Media.cs b/SabreTools.Metadata.DatItems/Formats/Media.cs
index 483c8a36..8448773a 100644
--- a/SabreTools.Metadata.DatItems/Formats/Media.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Media.cs
@@ -11,13 +11,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("media"), XmlRoot("media")]
     public sealed class Media : DatItem<Data.Models.Metadata.Media>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Media;
-
-        #endregion
-
         #region Constructors
 
         public Media() : base()
diff --git a/SabreTools.Metadata.DatItems/Formats/Part.cs b/SabreTools.Metadata.DatItems/Formats/Part.cs
index a4cae2d1..1ac80150 100644
--- a/SabreTools.Metadata.DatItems/Formats/Part.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Part.cs
@@ -13,9 +13,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     {
         #region Fields
 
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Part;
-
         [JsonIgnore]
         public bool FeaturesSpecified
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/PartFeature.cs b/SabreTools.Metadata.DatItems/Formats/PartFeature.cs
index fa31e20a..a2be2f3c 100644
--- a/SabreTools.Metadata.DatItems/Formats/PartFeature.cs
+++ b/SabreTools.Metadata.DatItems/Formats/PartFeature.cs
@@ -22,7 +22,8 @@ namespace SabreTools.Metadata.DatItems.Formats
         #region Fields
 
         /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.PartFeature;
+        /// <remarks>This needs to be set to PartFeature because internally it uses Feature</remarks>
+        public override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.PartFeature;
 
         #endregion
 
diff --git a/SabreTools.Metadata.DatItems/Formats/Port.cs b/SabreTools.Metadata.DatItems/Formats/Port.cs
index 9a38a1be..d98745e8 100644
--- a/SabreTools.Metadata.DatItems/Formats/Port.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Port.cs
@@ -13,9 +13,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     {
         #region Fields
 
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Port;
-
         [JsonIgnore]
         public bool AnalogsSpecified
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/RamOption.cs b/SabreTools.Metadata.DatItems/Formats/RamOption.cs
index d1f9cd12..0546dfe2 100644
--- a/SabreTools.Metadata.DatItems/Formats/RamOption.cs
+++ b/SabreTools.Metadata.DatItems/Formats/RamOption.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("ramoption"), XmlRoot("ramoption")]
     public sealed class RamOption : DatItem<Data.Models.Metadata.RamOption>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.RamOption;
-
-        #endregion
-
         #region Constructors
 
         public RamOption() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Release.cs b/SabreTools.Metadata.DatItems/Formats/Release.cs
index 5a5637b2..8e142259 100644
--- a/SabreTools.Metadata.DatItems/Formats/Release.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Release.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("release"), XmlRoot("release")]
     public sealed class Release : DatItem<Data.Models.Metadata.Release>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Release;
-
-        #endregion
-
         #region Constructors
 
         public Release() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/ReleaseDetails.cs b/SabreTools.Metadata.DatItems/Formats/ReleaseDetails.cs
index 0beb5f56..16b8f80c 100644
--- a/SabreTools.Metadata.DatItems/Formats/ReleaseDetails.cs
+++ b/SabreTools.Metadata.DatItems/Formats/ReleaseDetails.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("release_details"), XmlRoot("release_details")]
     public sealed class ReleaseDetails : DatItem<Data.Models.Metadata.ReleaseDetails>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.ReleaseDetails;
-
-        #endregion
-
         #region Constructors
 
         public ReleaseDetails() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Rom.cs b/SabreTools.Metadata.DatItems/Formats/Rom.cs
index 1ea42c6c..005110e7 100644
--- a/SabreTools.Metadata.DatItems/Formats/Rom.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Rom.cs
@@ -28,9 +28,6 @@ namespace SabreTools.Metadata.DatItems.Formats
 
         #region Fields
 
-        /// <inheritdoc>/>
-        internal override ItemType ItemType => ItemType.Rom;
-
         [JsonIgnore]
         public bool ItemStatusSpecified
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/Sample.cs b/SabreTools.Metadata.DatItems/Formats/Sample.cs
index 5fbf2932..06454412 100644
--- a/SabreTools.Metadata.DatItems/Formats/Sample.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Sample.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("sample"), XmlRoot("sample")]
     public class Sample : DatItem<Data.Models.Metadata.Sample>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Sample;
-
-        #endregion
-
         #region Constructors
 
         public Sample() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Serials.cs b/SabreTools.Metadata.DatItems/Formats/Serials.cs
index 7fc10ae1..8d8a8a4a 100644
--- a/SabreTools.Metadata.DatItems/Formats/Serials.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Serials.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("serials"), XmlRoot("serials")]
     public sealed class Serials : DatItem<Data.Models.Metadata.Serials>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Serials;
-
-        #endregion
-
         #region Constructors
 
         public Serials() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/SharedFeat.cs b/SabreTools.Metadata.DatItems/Formats/SharedFeat.cs
index 8c812e4b..63ba7ae3 100644
--- a/SabreTools.Metadata.DatItems/Formats/SharedFeat.cs
+++ b/SabreTools.Metadata.DatItems/Formats/SharedFeat.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("sharedfeat"), XmlRoot("sharedfeat")]
     public sealed class SharedFeat : DatItem<Data.Models.Metadata.SharedFeat>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.SharedFeat;
-
-        #endregion
-
         #region Constructors
 
         public SharedFeat() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Slot.cs b/SabreTools.Metadata.DatItems/Formats/Slot.cs
index 1d17bdac..06f97768 100644
--- a/SabreTools.Metadata.DatItems/Formats/Slot.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Slot.cs
@@ -13,9 +13,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     {
         #region Fields
 
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Slot;
-
         [JsonIgnore]
         public bool SlotOptionsSpecified
         {
diff --git a/SabreTools.Metadata.DatItems/Formats/SlotOption.cs b/SabreTools.Metadata.DatItems/Formats/SlotOption.cs
index c02768a5..73f90bd6 100644
--- a/SabreTools.Metadata.DatItems/Formats/SlotOption.cs
+++ b/SabreTools.Metadata.DatItems/Formats/SlotOption.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("slotoption"), XmlRoot("slotoption")]
     public sealed class SlotOption : DatItem<Data.Models.Metadata.SlotOption>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.SlotOption;
-
-        #endregion
-
         #region Constructors
 
         public SlotOption() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/SoftwareList.cs b/SabreTools.Metadata.DatItems/Formats/SoftwareList.cs
index ff686638..c6516287 100644
--- a/SabreTools.Metadata.DatItems/Formats/SoftwareList.cs
+++ b/SabreTools.Metadata.DatItems/Formats/SoftwareList.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("softwarelist"), XmlRoot("softwarelist")]
     public sealed class SoftwareList : DatItem<Data.Models.Metadata.SoftwareList>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.SoftwareList;
-
-        #endregion
-
         #region Constructors
 
         public SoftwareList() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/Sound.cs b/SabreTools.Metadata.DatItems/Formats/Sound.cs
index e9a51763..3716fa56 100644
--- a/SabreTools.Metadata.DatItems/Formats/Sound.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Sound.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("sound"), XmlRoot("sound")]
     public sealed class Sound : DatItem<Data.Models.Metadata.Sound>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.Sound;
-
-        #endregion
-
         #region Constructors
 
         public Sound() : base() { }
diff --git a/SabreTools.Metadata.DatItems/Formats/SourceDetails.cs b/SabreTools.Metadata.DatItems/Formats/SourceDetails.cs
index baf8dc70..00d189d4 100644
--- a/SabreTools.Metadata.DatItems/Formats/SourceDetails.cs
+++ b/SabreTools.Metadata.DatItems/Formats/SourceDetails.cs
@@ -10,13 +10,6 @@ namespace SabreTools.Metadata.DatItems.Formats
     [JsonObject("source_details"), XmlRoot("source_details")]
     public sealed class SourceDetails : DatItem<Data.Models.Metadata.SourceDetails>
     {
-        #region Fields
-
-        /// <inheritdoc>/>
-        internal override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.SourceDetails;
-
-        #endregion
-
         #region Constructors
 
         public SourceDetails() : base() { }
diff --git a/SabreTools.Metadata.DatItems/SabreTools.Metadata.DatItems.csproj b/SabreTools.Metadata.DatItems/SabreTools.Metadata.DatItems.csproj
index 5cc3061c..32969615 100644
--- a/SabreTools.Metadata.DatItems/SabreTools.Metadata.DatItems.csproj
+++ b/SabreTools.Metadata.DatItems/SabreTools.Metadata.DatItems.csproj
@@ -30,10 +30,6 @@
         <None Include="README.md" Pack="true" PackagePath="" />
     </ItemGroup>
 
-    <ItemGroup>
-        <InternalsVisibleTo Include="SabreTools.Metadata.DatItems.Test" />
-    </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="SabreTools.Hashing" Version="[2.0.0]" />