diff --git a/SabreTools.DatItems.Test/Formats/FileTests.cs b/SabreTools.DatItems.Test/Formats/FileTests.cs
index 667aa1db..8452efdf 100644
--- a/SabreTools.DatItems.Test/Formats/FileTests.cs
+++ b/SabreTools.DatItems.Test/Formats/FileTests.cs
@@ -29,6 +29,8 @@ namespace SabreTools.DatItems.Test.Formats
             file.SetFieldValue(DatItem.MachineKey, machine);
             file.SetFieldValue(DatItem.RemoveKey, (bool?)false);
             file.SetFieldValue(DatItem.SourceKey, source);
+            file.SetFieldValue<Machine>(DatItem.MachineKey, machine);
+            file.SetFieldValue<Source>(DatItem.SourceKey, source);
 
             Rom actual = file.ConvertToRom();
 
diff --git a/SabreTools.DatItems/DatItem.cs b/SabreTools.DatItems/DatItem.cs
index f7e42699..edf21b27 100644
--- a/SabreTools.DatItems/DatItem.cs
+++ b/SabreTools.DatItems/DatItem.cs
@@ -106,19 +106,19 @@ namespace SabreTools.DatItems
         /// </summary>
         /// <returns>Machine if available, null otherwise</returns>
         /// <remarks>Relies on <see cref="MachineKey"/></remarks> 
-        public virtual Machine? GetMachine() => null;
+        public Machine? GetMachine() => _internal.Read<Machine>(MachineKey);
 
         /// <summary>
         /// Gets the name to use for a DatItem
         /// </summary>
         /// <returns>Name if available, null otherwise</returns>
-        public virtual string? GetName() => null;
+        public virtual string? GetName() => _internal.GetName();
 
         /// <summary>
         /// Sets the name to use for a DatItem
         /// </summary>
         /// <param name="name">Name to set for the item</param>
-        public virtual void SetName(string? name) { }
+        public virtual void SetName(string? name) => _internal.SetName(name);
 
         #endregion
 
@@ -368,19 +368,6 @@ namespace SabreTools.DatItems
 
         #endregion
 
-        #region Accessors
-
-        /// <inheritdoc/>
-        public override Machine? GetMachine() => _internal.Read<Machine>(MachineKey);
-
-        /// <inheritdoc/>
-        public override string? GetName() => _internal.GetName();
-
-        /// <inheritdoc/>
-        public override void SetName(string? name) => _internal.SetName(name);
-
-        #endregion
-
         #region Cloning Methods
 
         /// <summary>