diff --git a/SabreTools.Library/DatFiles/ClrMamePro.cs b/SabreTools.Library/DatFiles/ClrMamePro.cs
index c7417f5b..e708e67a 100644
--- a/SabreTools.Library/DatFiles/ClrMamePro.cs
+++ b/SabreTools.Library/DatFiles/ClrMamePro.cs
@@ -652,19 +652,16 @@ namespace SabreTools.Library.DatFiles
 			// If no items were found for this machine, add a Blank placeholder
 			if (!containsItems)
 			{
-				if (this.KeepEmptyGames)
+				Blank blank = new Blank()
 				{
-					Blank blank = new Blank()
-					{
-						SystemID = sysid,
-						System = filename,
-						SourceID = srcid,
-					};
-					blank.CopyMachineInformation(machine);
+					SystemID = sysid,
+					System = filename,
+					SourceID = srcid,
+				};
+				blank.CopyMachineInformation(machine);
 
-					// Now process and add the rom
-					ParseAddHelper(blank, clean, remUnicode);
-				}
+				// Now process and add the rom
+				ParseAddHelper(blank, clean, remUnicode);
 			}
 		}
 
diff --git a/SabreTools.Library/DatFiles/Listxml.cs b/SabreTools.Library/DatFiles/Listxml.cs
index 0c2f62e0..d9ad8dce 100644
--- a/SabreTools.Library/DatFiles/Listxml.cs
+++ b/SabreTools.Library/DatFiles/Listxml.cs
@@ -185,6 +185,7 @@ namespace SabreTools.Library.DatFiles
 				RomOf = reader.GetAttribute("romof") ?? "",
 				SampleOf = reader.GetAttribute("sampleof") ?? "",
 				Devices = new List<string>(),
+				SlotOptions = new List<string>(),
 
 				MachineType = (machineType == MachineType.NULL ? MachineType.None : machineType),
 			};
@@ -495,19 +496,16 @@ namespace SabreTools.Library.DatFiles
 			// If no items were found for this machine, add a Blank placeholder
 			if (!containsItems)
 			{
-				if (this.KeepEmptyGames)
+				Blank blank = new Blank()
 				{
-					Blank blank = new Blank()
-					{
-						SystemID = sysid,
-						System = filename,
-						SourceID = srcid,
-					};
-					blank.CopyMachineInformation(machine);
+					SystemID = sysid,
+					System = filename,
+					SourceID = srcid,
+				};
+				blank.CopyMachineInformation(machine);
 
-					// Now process and add the rom
-					ParseAddHelper(blank, clean, remUnicode);
-				}
+				// Now process and add the rom
+				ParseAddHelper(blank, clean, remUnicode);
 			}
 		}
 
@@ -539,12 +537,12 @@ namespace SabreTools.Library.DatFiles
 				// Get the roms from the machine
 				switch (reader.Name)
 				{
-					case "slotoption": // These get added as devices currently
+					case "slotoption":
 						// string slotoption_name = reader.GetAttribute("name");
 						string devname = reader.GetAttribute("devname");
-						if (!machine.Devices.Contains(devname))
+						if (!machine.SlotOptions.Contains(devname))
 						{
-							machine.Devices.Add(devname);
+							machine.SlotOptions.Add(devname);
 						}
 						// bool? slotoption_default = Utilities.GetYesNo(reader.GetAttribute("default"));
 						reader.Read();
diff --git a/SabreTools.Library/DatFiles/Logiqx.cs b/SabreTools.Library/DatFiles/Logiqx.cs
index d4ebd990..12c8d2fa 100644
--- a/SabreTools.Library/DatFiles/Logiqx.cs
+++ b/SabreTools.Library/DatFiles/Logiqx.cs
@@ -537,19 +537,16 @@ namespace SabreTools.Library.DatFiles
 			// If no items were found for this machine, add a Blank placeholder
 			if (!containsItems)
 			{
-				if (this.KeepEmptyGames)
+				Blank blank = new Blank()
 				{
-					Blank blank = new Blank()
-					{
-						SystemID = sysid,
-						System = filename,
-						SourceID = srcid,
-					};
-					blank.CopyMachineInformation(machine);
+					SystemID = sysid,
+					System = filename,
+					SourceID = srcid,
+				};
+				blank.CopyMachineInformation(machine);
 
-					// Now process and add the rom
-					ParseAddHelper(blank, clean, remUnicode);
-				}
+				// Now process and add the rom
+				ParseAddHelper(blank, clean, remUnicode);
 			}
 		}
 
diff --git a/SabreTools.Library/DatFiles/OpenMSX.cs b/SabreTools.Library/DatFiles/OpenMSX.cs
index 8b2abb4a..a5340218 100644
--- a/SabreTools.Library/DatFiles/OpenMSX.cs
+++ b/SabreTools.Library/DatFiles/OpenMSX.cs
@@ -199,19 +199,16 @@ namespace SabreTools.Library.DatFiles
 			// If no items were found for this machine, add a Blank placeholder
 			if (!containsItems)
 			{
-				if (this.KeepEmptyGames)
+				Blank blank = new Blank()
 				{
-					Blank blank = new Blank()
-					{
-						SystemID = sysid,
-						System = filename,
-						SourceID = srcid,
-					};
-					blank.CopyMachineInformation(machine);
+					SystemID = sysid,
+					System = filename,
+					SourceID = srcid,
+				};
+				blank.CopyMachineInformation(machine);
 
-					// Now process and add the rom
-					ParseAddHelper(blank, clean, remUnicode);
-				}
+				// Now process and add the rom
+				ParseAddHelper(blank, clean, remUnicode);
 			}
 		}
 
diff --git a/SabreTools.Library/DatFiles/SabreDat.cs b/SabreTools.Library/DatFiles/SabreDat.cs
index d9d64a32..ca002e38 100644
--- a/SabreTools.Library/DatFiles/SabreDat.cs
+++ b/SabreTools.Library/DatFiles/SabreDat.cs
@@ -462,14 +462,7 @@ namespace SabreTools.Library.DatFiles
 								break;
 							default:
 								// By default, create a new Blank, just in case
-								if (this.KeepEmptyGames)
-								{
-									datItem = new Blank();
-								}
-								else
-								{
-									datItem = null;
-								}
+								datItem = new Blank();
 								break;
 						}
 
diff --git a/SabreTools.Library/DatFiles/SoftwareList.cs b/SabreTools.Library/DatFiles/SoftwareList.cs
index 9c251879..ecea5bef 100644
--- a/SabreTools.Library/DatFiles/SoftwareList.cs
+++ b/SabreTools.Library/DatFiles/SoftwareList.cs
@@ -231,19 +231,16 @@ namespace SabreTools.Library.DatFiles
 			// If no items were found for this machine, add a Blank placeholder
 			if (!containsItems)
 			{
-				if (this.KeepEmptyGames)
+				Blank blank = new Blank()
 				{
-					Blank blank = new Blank()
-					{
-						SystemID = sysid,
-						System = filename,
-						SourceID = srcid,
-					};
-					blank.CopyMachineInformation(machine);
+					SystemID = sysid,
+					System = filename,
+					SourceID = srcid,
+				};
+				blank.CopyMachineInformation(machine);
 
-					// Now process and add the rom
-					ParseAddHelper(blank, clean, remUnicode);
-				}
+				// Now process and add the rom
+				ParseAddHelper(blank, clean, remUnicode);
 			}
 		}