diff --git a/SabreTools.DatItems.Test/DatItemTests.cs b/SabreTools.DatItems.Test/DatItemTests.cs
index 4e80ca56..5c92f096 100644
--- a/SabreTools.DatItems.Test/DatItemTests.cs
+++ b/SabreTools.DatItems.Test/DatItemTests.cs
@@ -21,9 +21,14 @@ namespace SabreTools.DatItems.Test
         /// </summary>
         private class TestDatItem : DatItem<TestDatItemModel>
         {
-            protected override string? NameKey => TestDatItemModel.NameKey;
+            protected override string? NameKey => _nameKey;
+            private readonly string? _nameKey;
 
             protected override ItemType ItemType => ItemType.Blank;
+
+            public TestDatItem() => _nameKey = TestDatItemModel.NameKey;
+
+            public TestDatItem(string? nameKey) => _nameKey = nameKey;
         }
 
         #endregion
@@ -429,7 +434,7 @@ namespace SabreTools.DatItems.Test
 
         #endregion
 
-        // TODO: Change when Machine matching gets fixed
+        // TODO: Change when Machine retrieval gets fixed
         #region GetDuplicateStatusDB
 
         [Fact]
@@ -699,6 +704,120 @@ namespace SabreTools.DatItems.Test
 
         #endregion
 
+        // TODO: Change when Machine retrieval gets fixed
+        #region GetKeyDB
+
+        [Theory]
+        [InlineData(ItemKey.NULL, false, false, "")]
+        [InlineData(ItemKey.NULL, false, true, "")]
+        [InlineData(ItemKey.NULL, true, false, "")]
+        [InlineData(ItemKey.NULL, true, true, "")]
+        [InlineData(ItemKey.Machine, false, false, "0000000000-Machine")]
+        [InlineData(ItemKey.Machine, false, true, "Machine")]
+        [InlineData(ItemKey.Machine, true, false, "0000000000-machine")]
+        [InlineData(ItemKey.Machine, true, true, "machine")]
+        [InlineData(ItemKey.CRC, false, false, "00000000")]
+        [InlineData(ItemKey.CRC, false, true, "00000000")]
+        [InlineData(ItemKey.CRC, true, false, "00000000")]
+        [InlineData(ItemKey.CRC, true, true, "00000000")]
+        [InlineData(ItemKey.MD5, false, false, "d41d8cd98f00b204e9800998ecf8427e")]
+        [InlineData(ItemKey.MD5, false, true, "d41d8cd98f00b204e9800998ecf8427e")]
+        [InlineData(ItemKey.MD5, true, false, "d41d8cd98f00b204e9800998ecf8427e")]
+        [InlineData(ItemKey.MD5, true, true, "d41d8cd98f00b204e9800998ecf8427e")]
+        [InlineData(ItemKey.SHA1, false, false, "da39a3ee5e6b4b0d3255bfef95601890afd80709")]
+        [InlineData(ItemKey.SHA1, false, true, "da39a3ee5e6b4b0d3255bfef95601890afd80709")]
+        [InlineData(ItemKey.SHA1, true, false, "da39a3ee5e6b4b0d3255bfef95601890afd80709")]
+        [InlineData(ItemKey.SHA1, true, true, "da39a3ee5e6b4b0d3255bfef95601890afd80709")]
+        [InlineData(ItemKey.SHA256, false, false, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")]
+        [InlineData(ItemKey.SHA256, false, true, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")]
+        [InlineData(ItemKey.SHA256, true, false, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")]
+        [InlineData(ItemKey.SHA256, true, true, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")]
+        [InlineData(ItemKey.SHA384, false, false, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
+        [InlineData(ItemKey.SHA384, false, true, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
+        [InlineData(ItemKey.SHA384, true, false, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
+        [InlineData(ItemKey.SHA384, true, true, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
+        [InlineData(ItemKey.SHA512, false, false, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
+        [InlineData(ItemKey.SHA512, false, true, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
+        [InlineData(ItemKey.SHA512, true, false, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
+        [InlineData(ItemKey.SHA512, true, true, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
+        [InlineData(ItemKey.SpamSum, false, false, "3::")]
+        [InlineData(ItemKey.SpamSum, false, true, "3::")]
+        [InlineData(ItemKey.SpamSum, true, false, "3::")]
+        [InlineData(ItemKey.SpamSum, true, true, "3::")]
+        public void GetKeyDB_DefaultImplementation(ItemKey bucketedBy, bool lower, bool norename, string expected)
+        {
+            Source source = new Source(0);
+
+            Machine machine = new Machine();
+            machine.SetFieldValue(Models.Metadata.Machine.NameKey, "Machine");
+
+            DatItem datItem = new Blank();
+            datItem.SetFieldValue(DatItem.MachineKey, machine);
+
+            string actual = datItem.GetKeyDB(bucketedBy, source, lower, norename);
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(ItemKey.NULL, false, false, "")]
+        [InlineData(ItemKey.NULL, false, true, "")]
+        [InlineData(ItemKey.NULL, true, false, "")]
+        [InlineData(ItemKey.NULL, true, true, "")]
+        [InlineData(ItemKey.Machine, false, false, "0000000000-Machine")]
+        [InlineData(ItemKey.Machine, false, true, "Machine")]
+        [InlineData(ItemKey.Machine, true, false, "0000000000-machine")]
+        [InlineData(ItemKey.Machine, true, true, "machine")]
+        [InlineData(ItemKey.CRC, false, false, "DEADBEEF")]
+        [InlineData(ItemKey.CRC, false, true, "DEADBEEF")]
+        [InlineData(ItemKey.CRC, true, false, "deadbeef")]
+        [InlineData(ItemKey.CRC, true, true, "deadbeef")]
+        [InlineData(ItemKey.MD5, false, false, "DEADBEEF")]
+        [InlineData(ItemKey.MD5, false, true, "DEADBEEF")]
+        [InlineData(ItemKey.MD5, true, false, "deadbeef")]
+        [InlineData(ItemKey.MD5, true, true, "deadbeef")]
+        [InlineData(ItemKey.SHA1, false, false, "DEADBEEF")]
+        [InlineData(ItemKey.SHA1, false, true, "DEADBEEF")]
+        [InlineData(ItemKey.SHA1, true, false, "deadbeef")]
+        [InlineData(ItemKey.SHA1, true, true, "deadbeef")]
+        [InlineData(ItemKey.SHA256, false, false, "DEADBEEF")]
+        [InlineData(ItemKey.SHA256, false, true, "DEADBEEF")]
+        [InlineData(ItemKey.SHA256, true, false, "deadbeef")]
+        [InlineData(ItemKey.SHA256, true, true, "deadbeef")]
+        [InlineData(ItemKey.SHA384, false, false, "DEADBEEF")]
+        [InlineData(ItemKey.SHA384, false, true, "DEADBEEF")]
+        [InlineData(ItemKey.SHA384, true, false, "deadbeef")]
+        [InlineData(ItemKey.SHA384, true, true, "deadbeef")]
+        [InlineData(ItemKey.SHA512, false, false, "DEADBEEF")]
+        [InlineData(ItemKey.SHA512, false, true, "DEADBEEF")]
+        [InlineData(ItemKey.SHA512, true, false, "deadbeef")]
+        [InlineData(ItemKey.SHA512, true, true, "deadbeef")]
+        [InlineData(ItemKey.SpamSum, false, false, "BASE64")]
+        [InlineData(ItemKey.SpamSum, false, true, "BASE64")]
+        [InlineData(ItemKey.SpamSum, true, false, "base64")]
+        [InlineData(ItemKey.SpamSum, true, true, "base64")]
+        public void GetKeyDB_CustomImplementation(ItemKey bucketedBy, bool lower, bool norename, string expected)
+        {
+            Source source = new Source(0);
+
+            Machine machine = new Machine();
+            machine.SetFieldValue(Models.Metadata.Machine.NameKey, "Machine");
+
+            DatItem datItem = new Rom();
+            datItem.SetFieldValue(DatItem.MachineKey, machine);
+            datItem.SetFieldValue(Models.Metadata.Rom.CRCKey, "DEADBEEF");
+            datItem.SetFieldValue(Models.Metadata.Rom.MD5Key, "DEADBEEF");
+            datItem.SetFieldValue(Models.Metadata.Rom.SHA1Key, "DEADBEEF");
+            datItem.SetFieldValue(Models.Metadata.Rom.SHA256Key, "DEADBEEF");
+            datItem.SetFieldValue(Models.Metadata.Rom.SHA384Key, "DEADBEEF");
+            datItem.SetFieldValue(Models.Metadata.Rom.SHA512Key, "DEADBEEF");
+            datItem.SetFieldValue(Models.Metadata.Rom.SpamSumKey, "BASE64");
+
+            string actual = datItem.GetKeyDB(bucketedBy, source, lower, norename);
+            Assert.Equal(expected, actual);
+        }
+
+        #endregion
+
         #region GetName
 
         // TODO: Implement GetName tests
diff --git a/SabreTools.DatItems/DatItem.cs b/SabreTools.DatItems/DatItem.cs
index ca879b6f..af67d703 100644
--- a/SabreTools.DatItems/DatItem.cs
+++ b/SabreTools.DatItems/DatItem.cs
@@ -434,9 +434,6 @@ namespace SabreTools.DatItems
                     }
 
                     key = $"{sourceString}{machineString}";
-                    if (lower)
-                        key = key.ToLowerInvariant();
-
                     break;
 
                 case ItemKey.MD5:
@@ -466,6 +463,8 @@ namespace SabreTools.DatItems
 
             // Double and triple check the key for corner cases
             key ??= string.Empty;
+            if (lower)
+                key = key.ToLowerInvariant();
 
             return key;
         }
diff --git a/SabreTools.DatItems/Formats/Disk.cs b/SabreTools.DatItems/Formats/Disk.cs
index 3701b6fd..4b6058fd 100644
--- a/SabreTools.DatItems/Formats/Disk.cs
+++ b/SabreTools.DatItems/Formats/Disk.cs
@@ -141,6 +141,36 @@ namespace SabreTools.DatItems.Formats
             return key;
         }
 
+        /// <inheritdoc/>
+        public override string GetKeyDB(ItemKey bucketedBy, Source? source, bool lower = true, bool norename = true)
+        {
+            // Set the output key as the default blank string
+            string? key;
+
+            // Now determine what the key should be based on the bucketedBy value
+            switch (bucketedBy)
+            {
+                case ItemKey.MD5:
+                    key = GetStringFieldValue(Models.Metadata.Disk.MD5Key);
+                    break;
+
+                case ItemKey.SHA1:
+                    key = GetStringFieldValue(Models.Metadata.Disk.SHA1Key);
+                    break;
+
+                // Let the base handle generic stuff
+                default:
+                    return base.GetKeyDB(bucketedBy, source, lower, norename);
+            }
+
+            // Double and triple check the key for corner cases
+            key ??= string.Empty;
+            if (lower)
+                key = key.ToLowerInvariant();
+
+            return key;
+        }
+
         #endregion
     }
 }
diff --git a/SabreTools.DatItems/Formats/File.cs b/SabreTools.DatItems/Formats/File.cs
index d9fbe802..952df4e4 100644
--- a/SabreTools.DatItems/Formats/File.cs
+++ b/SabreTools.DatItems/Formats/File.cs
@@ -359,6 +359,44 @@ namespace SabreTools.DatItems.Formats
             return key;
         }
 
+        /// <inheritdoc/>
+        public override string GetKeyDB(ItemKey bucketedBy, Source? source, bool lower = true, bool norename = true)
+        {
+            // Set the output key as the default blank string
+            string? key;
+
+            // Now determine what the key should be based on the bucketedBy value
+            switch (bucketedBy)
+            {
+                case ItemKey.CRC:
+                    key = CRC;
+                    break;
+
+                case ItemKey.MD5:
+                    key = MD5;
+                    break;
+
+                case ItemKey.SHA1:
+                    key = SHA1;
+                    break;
+
+                case ItemKey.SHA256:
+                    key = SHA256;
+                    break;
+
+                // Let the base handle generic stuff
+                default:
+                    return base.GetKeyDB(bucketedBy, source, lower, norename);
+            }
+
+            // Double and triple check the key for corner cases
+            key ??= string.Empty;
+            if (lower)
+                key = key.ToLowerInvariant();
+
+            return key;
+        }
+
         #endregion
     }
 }
diff --git a/SabreTools.DatItems/Formats/Media.cs b/SabreTools.DatItems/Formats/Media.cs
index a7a6eb00..efd1dd60 100644
--- a/SabreTools.DatItems/Formats/Media.cs
+++ b/SabreTools.DatItems/Formats/Media.cs
@@ -110,6 +110,44 @@ namespace SabreTools.DatItems.Formats
             return key;
         }
 
+        /// <inheritdoc/>
+        public override string GetKeyDB(ItemKey bucketedBy, Source? source, bool lower = true, bool norename = true)
+        {
+            // Set the output key as the default blank string
+            string? key;
+
+            // Now determine what the key should be based on the bucketedBy value
+            switch (bucketedBy)
+            {
+                case ItemKey.MD5:
+                    key = GetStringFieldValue(Models.Metadata.Media.MD5Key);
+                    break;
+
+                case ItemKey.SHA1:
+                    key = GetStringFieldValue(Models.Metadata.Media.SHA1Key);
+                    break;
+
+                case ItemKey.SHA256:
+                    key = GetStringFieldValue(Models.Metadata.Media.SHA256Key);
+                    break;
+
+                case ItemKey.SpamSum:
+                    key = GetStringFieldValue(Models.Metadata.Media.SpamSumKey);
+                    break;
+
+                // Let the base handle generic stuff
+                default:
+                    return base.GetKeyDB(bucketedBy, source, lower, norename);
+            }
+
+            // Double and triple check the key for corner cases
+            key ??= string.Empty;
+            if (lower)
+                key = key.ToLowerInvariant();
+
+            return key;
+        }
+
         #endregion
     }
 }
diff --git a/SabreTools.DatItems/Formats/Rom.cs b/SabreTools.DatItems/Formats/Rom.cs
index 95cf1c9b..0ada3080 100644
--- a/SabreTools.DatItems/Formats/Rom.cs
+++ b/SabreTools.DatItems/Formats/Rom.cs
@@ -177,6 +177,56 @@ namespace SabreTools.DatItems.Formats
             return key;
         }
 
+        /// <inheritdoc/>
+        public override string GetKeyDB(ItemKey bucketedBy, Source? source, bool lower = true, bool norename = true)
+        {
+            // Set the output key as the default blank string
+            string? key;
+
+            // Now determine what the key should be based on the bucketedBy value
+            switch (bucketedBy)
+            {
+                case ItemKey.CRC:
+                    key = GetStringFieldValue(Models.Metadata.Rom.CRCKey);
+                    break;
+
+                case ItemKey.MD5:
+                    key = GetStringFieldValue(Models.Metadata.Rom.MD5Key);
+                    break;
+
+                case ItemKey.SHA1:
+                    key = GetStringFieldValue(Models.Metadata.Rom.SHA1Key);
+                    break;
+
+                case ItemKey.SHA256:
+                    key = GetStringFieldValue(Models.Metadata.Rom.SHA256Key);
+                    break;
+
+                case ItemKey.SHA384:
+                    key = GetStringFieldValue(Models.Metadata.Rom.SHA384Key);
+                    break;
+
+                case ItemKey.SHA512:
+                    key = GetStringFieldValue(Models.Metadata.Rom.SHA512Key);
+                    break;
+
+                case ItemKey.SpamSum:
+                    key = GetStringFieldValue(Models.Metadata.Rom.SpamSumKey);
+                    break;
+
+                // Let the base handle generic stuff
+                default:
+                    return base.GetKeyDB(bucketedBy, source, lower, norename);
+            }
+
+            // Double and triple check the key for corner cases
+            key ??= string.Empty;
+            if (lower)
+                key = key.ToLowerInvariant();
+
+            return key;
+        }
+
         #endregion
     }
 }