diff --git a/SabreTools.Library/Items/Archive.cs b/SabreTools.Library/Items/Archive.cs
index 0a7f367d..7e1d9689 100644
--- a/SabreTools.Library/Items/Archive.cs
+++ b/SabreTools.Library/Items/Archive.cs
@@ -24,7 +24,7 @@ namespace SabreTools.Library.Items
 
 		public override object Clone()
 		{
-			Archive item = new Archive()
+			return new Archive()
 			{
 				Name = this.Name,
 				Type = this.Type,
@@ -39,14 +39,26 @@ namespace SabreTools.Library.Items
 				AreaName = this.AreaName,
 				AreaSize = this.AreaSize,
 
+				MachineName = this.MachineName,
+				Comment = this.Comment,
+				MachineDescription = this.MachineDescription,
+				Year = this.Year,
+				Manufacturer = this.Manufacturer,
+				RomOf = this.RomOf,
+				CloneOf = this.CloneOf,
+				SampleOf = this.SampleOf,
+				SourceFile = this.SourceFile,
+				Runnable = this.Runnable,
+				Board = this.Board,
+				RebuildTo = this.RebuildTo,
+				Devices = this.Devices,
+				MachineType = this.MachineType,
+
 				SystemID = this.SystemID,
 				System = this.System,
 				SourceID = this.SourceID,
 				Source = this.Source,
 			};
-
-			item.CopyMachineInformation(this);
-			return item;
 		}
 
 		#endregion
diff --git a/SabreTools.Library/Items/BiosSet.cs b/SabreTools.Library/Items/BiosSet.cs
index 9c1a6997..100e92aa 100644
--- a/SabreTools.Library/Items/BiosSet.cs
+++ b/SabreTools.Library/Items/BiosSet.cs
@@ -46,7 +46,7 @@ namespace SabreTools.Library.Items
 
 		public override object Clone()
 		{
-			BiosSet item =  new BiosSet()
+			return new BiosSet()
 			{
 				Name = this.Name,
 				Type = this.Type,
@@ -61,6 +61,21 @@ namespace SabreTools.Library.Items
 				AreaName = this.AreaName,
 				AreaSize = this.AreaSize,
 
+				MachineName = this.MachineName,
+				Comment = this.Comment,
+				MachineDescription = this.MachineDescription,
+				Year = this.Year,
+				Manufacturer = this.Manufacturer,
+				RomOf = this.RomOf,
+				CloneOf = this.CloneOf,
+				SampleOf = this.SampleOf,
+				SourceFile = this.SourceFile,
+				Runnable = this.Runnable,
+				Board = this.Board,
+				RebuildTo = this.RebuildTo,
+				Devices = this.Devices,
+				MachineType = this.MachineType,
+
 				SystemID = this.SystemID,
 				System = this.System,
 				SourceID = this.SourceID,
@@ -69,9 +84,6 @@ namespace SabreTools.Library.Items
 				Description = this.Description,
 				Default = this.Default,
 			};
-
-			item.CopyMachineInformation(this);
-			return item;
 		}
 
 		#endregion
diff --git a/SabreTools.Library/Items/Disk.cs b/SabreTools.Library/Items/Disk.cs
index 7e24f299..ff44b4d1 100644
--- a/SabreTools.Library/Items/Disk.cs
+++ b/SabreTools.Library/Items/Disk.cs
@@ -76,7 +76,7 @@ namespace SabreTools.Library.Items
 
 		public override object Clone()
 		{
-			Disk item = new Disk()
+			return new Disk()
 			{
 				Name = this.Name,
 				Type = this.Type,
@@ -91,6 +91,21 @@ namespace SabreTools.Library.Items
 				AreaName = this.AreaName,
 				AreaSize = this.AreaSize,
 
+				MachineName = this.MachineName,
+				Comment = this.Comment,
+				MachineDescription = this.MachineDescription,
+				Year = this.Year,
+				Manufacturer = this.Manufacturer,
+				RomOf = this.RomOf,
+				CloneOf = this.CloneOf,
+				SampleOf = this.SampleOf,
+				SourceFile = this.SourceFile,
+				Runnable = this.Runnable,
+				Board = this.Board,
+				RebuildTo = this.RebuildTo,
+				Devices = this.Devices,
+				MachineType = this.MachineType,
+
 				SystemID = this.SystemID,
 				System = this.System,
 				SourceID = this.SourceID,
@@ -103,9 +118,6 @@ namespace SabreTools.Library.Items
 				SHA512 = this.SHA512,
 				ItemStatus = this.ItemStatus,
 			};
-
-			item.CopyMachineInformation(this);
-			return item;
 		}
 
 		#endregion
diff --git a/SabreTools.Library/Items/Release.cs b/SabreTools.Library/Items/Release.cs
index 53bf237b..93b081ae 100644
--- a/SabreTools.Library/Items/Release.cs
+++ b/SabreTools.Library/Items/Release.cs
@@ -62,7 +62,7 @@ namespace SabreTools.Library.Items
 
 		public override object Clone()
 		{
-			Release item = new Release()
+			return new Release()
 			{
 				Name = this.Name,
 				Type = this.Type,
@@ -77,6 +77,21 @@ namespace SabreTools.Library.Items
 				AreaName = this.AreaName,
 				AreaSize = this.AreaSize,
 
+				MachineName = this.MachineName,
+				Comment = this.Comment,
+				MachineDescription = this.MachineDescription,
+				Year = this.Year,
+				Manufacturer = this.Manufacturer,
+				RomOf = this.RomOf,
+				CloneOf = this.CloneOf,
+				SampleOf = this.SampleOf,
+				SourceFile = this.SourceFile,
+				Runnable = this.Runnable,
+				Board = this.Board,
+				RebuildTo = this.RebuildTo,
+				Devices = this.Devices,
+				MachineType = this.MachineType,
+
 				SystemID = this.SystemID,
 				System = this.System,
 				SourceID = this.SourceID,
@@ -87,9 +102,6 @@ namespace SabreTools.Library.Items
 				Date = this.Date,
 				Default = this.Default,
 			};
-
-			item.CopyMachineInformation(this);
-			return item;
 		}
 
 		#endregion
diff --git a/SabreTools.Library/Items/Rom.cs b/SabreTools.Library/Items/Rom.cs
index c56fad43..503ccda8 100644
--- a/SabreTools.Library/Items/Rom.cs
+++ b/SabreTools.Library/Items/Rom.cs
@@ -140,7 +140,7 @@ namespace SabreTools.Library.Items
 
 		public override object Clone()
 		{
-			Rom item = new Rom()
+			return new Rom()
 			{
 				Name = this.Name,
 				Type = this.Type,
@@ -155,24 +155,36 @@ namespace SabreTools.Library.Items
 				AreaName = this.AreaName,
 				AreaSize = this.AreaSize,
 
+				MachineName = this.MachineName,
+				Comment = this.Comment,
+				MachineDescription = this.MachineDescription,
+				Year = this.Year,
+				Manufacturer = this.Manufacturer,
+				RomOf = this.RomOf,
+				CloneOf = this.CloneOf,
+				SampleOf = this.SampleOf,
+				SourceFile = this.SourceFile,
+				Runnable = this.Runnable,
+				Board = this.Board,
+				RebuildTo = this.RebuildTo,
+				Devices = this.Devices,
+				MachineType = this.MachineType,
+
 				SystemID = this.SystemID,
 				System = this.System,
 				SourceID = this.SourceID,
 				Source = this.Source,
 
-				MD5 = _md5,
-				SHA1 = _sha1,
-				SHA256 = _sha256,
-				SHA384 = _sha384,
-				SHA512 = _sha512,
-				ItemStatus = this.ItemStatus,
 				Size = this.Size,
-				CRC = _crc,
+				CRC = this.CRC,
+				MD5 = this.MD5,
+				SHA1 = this.SHA1,
+				SHA256 = this.SHA256,
+				SHA384 = this.SHA384,
+				SHA512 = this.SHA512,
+				ItemStatus = this.ItemStatus,
 				Date = this.Date,
 			};
-
-			item.CopyMachineInformation(this);
-			return item;
 		}
 
 		#endregion
diff --git a/SabreTools.Library/Items/Sample.cs b/SabreTools.Library/Items/Sample.cs
index 924d2f84..cf5087f9 100644
--- a/SabreTools.Library/Items/Sample.cs
+++ b/SabreTools.Library/Items/Sample.cs
@@ -24,7 +24,7 @@ namespace SabreTools.Library.Items
 
 		public override object Clone()
 		{
-			Sample item = new Sample()
+			return new Sample()
 			{
 				Name = this.Name,
 				Type = this.Type,
@@ -39,14 +39,26 @@ namespace SabreTools.Library.Items
 				AreaName = this.AreaName,
 				AreaSize = this.AreaSize,
 
+				MachineName = this.MachineName,
+				Comment = this.Comment,
+				MachineDescription = this.MachineDescription,
+				Year = this.Year,
+				Manufacturer = this.Manufacturer,
+				RomOf = this.RomOf,
+				CloneOf = this.CloneOf,
+				SampleOf = this.SampleOf,
+				SourceFile = this.SourceFile,
+				Runnable = this.Runnable,
+				Board = this.Board,
+				RebuildTo = this.RebuildTo,
+				Devices = this.Devices,
+				MachineType = this.MachineType,
+
 				SystemID = this.SystemID,
 				System = this.System,
 				SourceID = this.SourceID,
 				Source = this.Source,
 			};
-
-			item.CopyMachineInformation(this);
-			return item;
 		}
 
 		#endregion