diff --git a/Source/db/vanilla/Alchemy.lua b/Source/db/vanilla/Alchemy.lua
index bba7196..fd5a334 100644
--- a/Source/db/vanilla/Alchemy.lua
+++ b/Source/db/vanilla/Alchemy.lua
@@ -770,8 +770,8 @@ addon.db.Alchemy = {
 		reagentQuantities = {3, 1, },
 		source = sources.Item,
 		sourceItemID = 13476,
-		itemSource = sources.Vendors,
-		itemVendors = {7027},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Blackrock Slayer',
 	},
 	[17553] = {
 		spellID = 17553,
@@ -1014,8 +1014,8 @@ addon.db.Alchemy = {
 		reagentQuantities = {1, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 13495,
-		itemSource = sources.Vendors,
-		itemVendors = {7428},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Frostmaul Giant',
 	},
 	[17576] = {
 		spellID = 17576,
@@ -1036,8 +1036,8 @@ addon.db.Alchemy = {
 		reagentQuantities = {1, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 13497,
-		itemSource = sources.Vendors,
-		itemVendors = {7437},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Cobalt Mageweaver',
 	},
 	[17578] = {
 		spellID = 17578,
@@ -1122,8 +1122,8 @@ addon.db.Alchemy = {
 		reagentQuantities = {30, 10, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 13519,
-		itemSource = sources.Vendors,
-		itemVendors = {10363},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'General Drakkisath',
 	},
 	[17636] = {
 		spellID = 17636,
@@ -1144,8 +1144,8 @@ addon.db.Alchemy = {
 		reagentQuantities = {30, 10, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 13521,
-		itemSource = sources.Vendors,
-		itemVendors = {10508},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Ras Frostwhisper',
 	},
 	[17638] = {
 		spellID = 17638,
@@ -1155,8 +1155,8 @@ addon.db.Alchemy = {
 		reagentQuantities = {30, 10, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 13522,
-		itemSource = sources.Vendors,
-		itemVendors = {10339},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Gyth',
 	},
 	[24266] = {
 		spellID = 24266,
diff --git a/Source/db/vanilla/Blacksmithing.lua b/Source/db/vanilla/Blacksmithing.lua
index 81fdaca..1ebe57b 100644
--- a/Source/db/vanilla/Blacksmithing.lua
+++ b/Source/db/vanilla/Blacksmithing.lua
@@ -1445,8 +1445,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {18, 4, },
 		source = sources.Item,
 		sourceItemID = 11610,
-		itemSource = sources.Vendors,
-		itemVendors = {9028},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Grizzle',
 	},
 	[16646] = {
 		spellID = 16646,
@@ -1640,8 +1640,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {20, 8, },
 		source = sources.Item,
 		sourceItemID = 11612,
-		itemSource = sources.Vendors,
-		itemVendors = {9543},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Ribbly Screwspigot',
 	},
 	[16654] = {
 		spellID = 16654,
@@ -1853,8 +1853,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {20, 2, 6, },
 		source = sources.Item,
 		sourceItemID = 12706,
-		itemSource = sources.Vendors,
-		itemVendors = {4366},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Strashaz Serpent Guard',
 	},
 	[16665] = {
 		spellID = 16665,
@@ -1864,8 +1864,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {20, 2, 10, },
 		source = sources.Item,
 		sourceItemID = 12707,
-		itemSource = sources.Vendors,
-		itemVendors = {1836},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Scarlet Cavalier',
 	},
 	[16724] = {
 		spellID = 16724,
@@ -1895,8 +1895,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {30, 2, 2, 1, },
 		source = sources.Item,
 		sourceItemID = 12714,
-		itemSource = sources.Vendors,
-		itemVendors = {4364},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Strashaz Warrior',
 	},
 	[16728] = {
 		spellID = 16728,
@@ -1948,8 +1948,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {40, 2, 1, },
 		source = sources.Item,
 		sourceItemID = 12719,
-		itemSource = sources.Vendors,
-		itemVendors = {1885},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Scarlet Smith',
 	},
 	[16741] = {
 		spellID = 16741,
@@ -2012,8 +2012,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {50, 15, 4, 6, 10, },
 		source = sources.Item,
 		sourceItemID = 12833,
-		itemSource = sources.Vendors,
-		itemVendors = {10438},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Maleki the Pallid',
 	},
 	[16990] = {
 		spellID = 16990,
@@ -2023,8 +2023,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {15, 8, 1, 4, 8, 2, },
 		source = sources.Item,
 		sourceItemID = 12834,
-		itemSource = sources.Vendors,
-		itemVendors = {10899},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Goraluk Anvilcrack',
 	},
 	[16991] = {
 		spellID = 16991,
@@ -2034,8 +2034,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {40, 12, 10, 8, 2, 4, },
 		source = sources.Item,
 		sourceItemID = 12835,
-		itemSource = sources.Vendors,
-		itemVendors = {9736},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Quartermaster Zigris',
 	},
 	[16992] = {
 		spellID = 16992,
@@ -2045,8 +2045,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {18, 8, 8, 4, 2, 4, },
 		source = sources.Item,
 		sourceItemID = 12836,
-		itemSource = sources.Vendors,
-		itemVendors = {1844},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Foreman Marcrid',
 	},
 	[16993] = {
 		spellID = 16993,
@@ -2056,8 +2056,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {20, 8, 8, 6, 4, },
 		source = sources.Item,
 		sourceItemID = 12837,
-		itemSource = sources.Vendors,
-		itemVendors = {10899},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Goraluk Anvilcrack',
 	},
 	[16994] = {
 		spellID = 16994,
@@ -2067,8 +2067,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {20, 6, 2, },
 		source = sources.Item,
 		sourceItemID = 12838,
-		itemSource = sources.Vendors,
-		itemVendors = {9596},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Bannok Grimaxe',
 	},
 	[16995] = {
 		spellID = 16995,
@@ -2078,8 +2078,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {10, 10, 2, 6, 6, 6, 4, },
 		source = sources.Item,
 		sourceItemID = 12839,
-		itemSource = sources.Vendors,
-		itemVendors = {10997},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Cannon Master Willey',
 	},
 	[20873] = {
 		spellID = 20873,
@@ -2362,8 +2362,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {18, 40, 12, 10, 4, },
 		source = sources.Item,
 		sourceItemID = 22222,
-		itemSource = sources.Vendors,
-		itemVendors = {15263},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'The Prophet Skeram',
 	},
 	[27588] = {
 		spellID = 27588,
@@ -2384,8 +2384,8 @@ addon.db.Blacksmithing = {
 		reagentQuantities = {8, 24, 8, 1, },
 		source = sources.Item,
 		sourceItemID = 22220,
-		itemSource = sources.Vendors,
-		itemVendors = {15340},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Moam',
 	},
 	[27590] = {
 		spellID = 27590,
diff --git a/Source/db/vanilla/Cooking.lua b/Source/db/vanilla/Cooking.lua
index 63ce0c9..6a02bdc 100644
--- a/Source/db/vanilla/Cooking.lua
+++ b/Source/db/vanilla/Cooking.lua
@@ -828,8 +828,8 @@ addon.db.Cooking = {
 		reagentQuantities = {1, 1, },
 		source = sources.Item,
 		sourceItemID = 18267,
-		itemSource = sources.Vendors,
-		itemVendors = {14354},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Pusillin',
 	},
 	[24801] = {
 		spellID = 24801,
diff --git a/Source/db/vanilla/Enchanting.lua b/Source/db/vanilla/Enchanting.lua
index fcd3d92..900a05e 100644
--- a/Source/db/vanilla/Enchanting.lua
+++ b/Source/db/vanilla/Enchanting.lua
@@ -753,8 +753,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {3, 3, },
 		source = sources.Item,
 		sourceItemID = 11203,
-		itemSource = sources.Vendors,
-		itemVendors = {674},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Venture Co. Strip Miner',
 	},
 	[13846] = {
 		spellID = 13846,
@@ -981,8 +981,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {3, },
 		source = sources.Item,
 		sourceItemID = 16214,
-		itemSource = sources.Vendors,
-		itemVendors = {2642},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Vilebranch Shadowcaster',
 	},
 	[20020] = {
 		spellID = 20020,
@@ -1002,8 +1002,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {4, 1, },
 		source = sources.Item,
 		sourceItemID = 11207,
-		itemSource = sources.Vendors,
-		itemVendors = {9024},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Pyromancer Loregrain',
 	},
 	[15596] = {
 		spellID = 15596,
@@ -1013,8 +1013,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {1, 1, 3, },
 		source = sources.Item,
 		sourceItemID = 11813,
-		itemSource = sources.Vendors,
-		itemVendors = {9025},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Lord Roccor',
 	},
 	[20014] = {
 		spellID = 20014,
@@ -1056,8 +1056,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {3, 3, },
 		source = sources.Item,
 		sourceItemID = 16219,
-		itemSource = sources.Vendors,
-		itemVendors = {6201},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Legashi Rogue',
 	},
 	[25128] = {
 		spellID = 25128,
@@ -1099,8 +1099,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {2, 4, },
 		source = sources.Item,
 		sourceItemID = 16222,
-		itemSource = sources.Vendors,
-		itemVendors = {9447},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Scarlet Warder',
 	},
 	[20015] = {
 		spellID = 20015,
@@ -1121,8 +1121,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {4, 1, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 16223,
-		itemSource = sources.Vendors,
-		itemVendors = {7524},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Anguished Highborne',
 	},
 	[20028] = {
 		spellID = 20028,
@@ -1132,8 +1132,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {3, 1, },
 		source = sources.Item,
 		sourceItemID = 16242,
-		itemSource = sources.Vendors,
-		itemVendors = {9452},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Scarlet Enchanter',
 	},
 	[20051] = {
 		spellID = 20051,
@@ -1198,8 +1198,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {6, 6, },
 		source = sources.Item,
 		sourceItemID = 16246,
-		itemSource = sources.Vendors,
-		itemVendors = {7372},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Deadwind Warlock',
 	},
 	[20013] = {
 		spellID = 20013,
@@ -1209,8 +1209,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {4, 4, },
 		source = sources.Item,
 		sourceItemID = 16244,
-		itemSource = sources.Vendors,
-		itemVendors = {9198},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Spirestone Mystic',
 	},
 	[20023] = {
 		spellID = 20023,
@@ -1230,8 +1230,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {4, 10, },
 		source = sources.Item,
 		sourceItemID = 16247,
-		itemSource = sources.Vendors,
-		itemVendors = {10317},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Blackhand Elite',
 	},
 	[20033] = {
 		spellID = 20033,
@@ -1241,8 +1241,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {4, 4, },
 		source = sources.Item,
 		sourceItemID = 16248,
-		itemSource = sources.Vendors,
-		itemVendors = {10398},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Thuzadin Shadowcaster',
 	},
 	[25129] = {
 		spellID = 25129,
@@ -1294,8 +1294,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {2, 10, },
 		source = sources.Item,
 		sourceItemID = 16250,
-		itemSource = sources.Vendors,
-		itemVendors = {9216},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Spirestone Warlord',
 	},
 	[20032] = {
 		spellID = 20032,
@@ -1305,8 +1305,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {6, 6, 6, },
 		source = sources.Item,
 		sourceItemID = 16254,
-		itemSource = sources.Vendors,
-		itemVendors = {10499},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Spectral Researcher',
 	},
 	[20034] = {
 		spellID = 20034,
@@ -1316,8 +1316,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {4, 2, },
 		source = sources.Item,
 		sourceItemID = 16252,
-		itemSource = sources.Vendors,
-		itemVendors = {4494},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Scarlet Spellbinder',
 	},
 	[20035] = {
 		spellID = 20035,
@@ -1327,8 +1327,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {12, 2, },
 		source = sources.Item,
 		sourceItemID = 16255,
-		itemSource = sources.Vendors,
-		itemVendors = {10469},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Scholomance Adept',
 	},
 	[20036] = {
 		spellID = 20036,
@@ -1338,8 +1338,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {12, 2, },
 		source = sources.Item,
 		sourceItemID = 16249,
-		itemSource = sources.Vendors,
-		itemVendors = {10422},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Crimson Sorcerer',
 	},
 	[22749] = {
 		spellID = 22749,
@@ -1404,8 +1404,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {4, 6, 8, },
 		source = sources.Item,
 		sourceItemID = 20726,
-		itemSource = sources.Vendors,
-		itemVendors = {15275},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Emperor Vek\'nilash',
 	},
 	[25073] = {
 		spellID = 25073,
@@ -1497,8 +1497,8 @@ addon.db.Enchanting = {
 		reagentQuantities = {4, 6, 2, },
 		source = sources.Item,
 		sourceItemID = 20735,
-		itemSource = sources.Vendors,
-		itemVendors = {15276},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Emperor Vek\'lor',
 	},
 	[25086] = {
 		spellID = 25086,
diff --git a/Source/db/vanilla/Engineering.lua b/Source/db/vanilla/Engineering.lua
index f253a61..a479e96 100644
--- a/Source/db/vanilla/Engineering.lua
+++ b/Source/db/vanilla/Engineering.lua
@@ -1230,8 +1230,8 @@ addon.db.Engineering = {
 		reagentQuantities = {1, 2, 1, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 18661,
-		itemSource = sources.Vendors,
-		itemVendors = {8920},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Weapon Technician',
 	},
 	[23071] = {
 		spellID = 23071,
@@ -1295,8 +1295,8 @@ addon.db.Engineering = {
 		reagentQuantities = {4, 2, 4, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 18654,
-		itemSource = sources.Vendors,
-		itemVendors = {8920},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Weapon Technician',
 	},
 	[19793] = {
 		spellID = 19793,
@@ -1316,8 +1316,8 @@ addon.db.Engineering = {
 		reagentQuantities = {2, 2, 2, 2, 2, },
 		source = sources.Item,
 		sourceItemID = 18653,
-		itemSource = sources.Vendors,
-		itemVendors = {9499},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Plugger Spazzring',
 	},
 	[19794] = {
 		spellID = 19794,
@@ -1327,8 +1327,8 @@ addon.db.Engineering = {
 		reagentQuantities = {1, 4, 2, 8, },
 		source = sources.Item,
 		sourceItemID = 16045,
-		itemSource = sources.Vendors,
-		itemVendors = {6195},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Spitelash Siren',
 	},
 	[26426] = {
 		spellID = 26426,
@@ -1400,8 +1400,8 @@ addon.db.Engineering = {
 		reagentQuantities = {2, 6, 2, 2, 2, 4, },
 		source = sources.Item,
 		sourceItemID = 16048,
-		itemSource = sources.Vendors,
-		itemVendors = {8897},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Doomforge Craftsman',
 	},
 	[19814] = {
 		spellID = 19814,
@@ -1459,8 +1459,8 @@ addon.db.Engineering = {
 		reagentQuantities = {2, 1, 3, 3, },
 		source = sources.Item,
 		sourceItemID = 16049,
-		itemSource = sources.Vendors,
-		itemVendors = {8920},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Weapon Technician',
 	},
 	[19800] = {
 		spellID = 19800,
@@ -1491,8 +1491,8 @@ addon.db.Engineering = {
 		reagentQuantities = {2, 1, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 16052,
-		itemSource = sources.Vendors,
-		itemVendors = {10426},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Crimson Inquisitor',
 	},
 	[19825] = {
 		spellID = 19825,
@@ -1502,8 +1502,8 @@ addon.db.Engineering = {
 		reagentQuantities = {1, 2, 4, },
 		source = sources.Item,
 		sourceItemID = 16053,
-		itemSource = sources.Vendors,
-		itemVendors = {8900},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Doomforge Arcanasmith',
 	},
 	[23081] = {
 		spellID = 23081,
@@ -1513,8 +1513,8 @@ addon.db.Engineering = {
 		reagentQuantities = {4, 3, 6, 4, 2, },
 		source = sources.Item,
 		sourceItemID = 18657,
-		itemSource = sources.Vendors,
-		itemVendors = {10264},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Solakar Flamewreath',
 	},
 	[19830] = {
 		spellID = 19830,
@@ -1524,8 +1524,8 @@ addon.db.Engineering = {
 		reagentQuantities = {1, 8, 10, 6, 4, 6, },
 		source = sources.Item,
 		sourceItemID = 16054,
-		itemSource = sources.Vendors,
-		itemVendors = {7437},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Cobalt Mageweaver',
 	},
 	[19831] = {
 		spellID = 19831,
@@ -1545,8 +1545,8 @@ addon.db.Engineering = {
 		reagentQuantities = {10, 2, 2, 2, 2, 2, },
 		source = sources.Item,
 		sourceItemID = 16056,
-		itemSource = sources.Vendors,
-		itemVendors = {8561},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Mossflayer Shadowhunter',
 	},
 	[22704] = {
 		spellID = 22704,
@@ -1599,8 +1599,8 @@ addon.db.Engineering = {
 		reagentQuantities = {8, 4, 6, 4, 2, 2, },
 		source = sources.Item,
 		sourceItemID = 18658,
-		itemSource = sources.Vendors,
-		itemVendors = {10426},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Crimson Inquisitor',
 	},
 	[24356] = {
 		spellID = 24356,
diff --git a/Source/db/vanilla/GnomishEngineering.lua b/Source/db/vanilla/GnomishEngineering.lua
index e8fbf5f..9e8e1a0 100644
--- a/Source/db/vanilla/GnomishEngineering.lua
+++ b/Source/db/vanilla/GnomishEngineering.lua
@@ -93,8 +93,8 @@ addon.db.GnomishEngineering = {
 		reagentQuantities = {1, 2, 1, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 18661,
-		itemSource = sources.Vendors,
-		itemVendors = {8920},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Weapon Technician',
 	},
 	[23489] = {
 		spellID = 23489,
diff --git a/Source/db/vanilla/Leatherworking.lua b/Source/db/vanilla/Leatherworking.lua
index cc3d30e..facf7df 100644
--- a/Source/db/vanilla/Leatherworking.lua
+++ b/Source/db/vanilla/Leatherworking.lua
@@ -1062,8 +1062,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {12, 12, 4, },
 		source = sources.Item,
 		sourceItemID = 8395,
-		itemSource = sources.Vendors,
-		itemVendors = {5618},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Wastewander Bandit',
 	},
 	[10529] = {
 		spellID = 10529,
@@ -1093,8 +1093,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {10, 4, 2, },
 		source = sources.Item,
 		sourceItemID = 8397,
-		itemSource = sources.Vendors,
-		itemVendors = {5617},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Wastewander Shadow Mage',
 	},
 	[435904] = {
 		spellID = 435904,
@@ -1164,8 +1164,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {6, 8, 2, },
 		source = sources.Item,
 		sourceItemID = 8398,
-		itemSource = sources.Vendors,
-		itemVendors = {5616},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Wastewander Thief',
 	},
 	[10544] = {
 		spellID = 10544,
@@ -1262,8 +1262,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {12, 12, 6, },
 		source = sources.Item,
 		sourceItemID = 8399,
-		itemSource = sources.Vendors,
-		itemVendors = {5615},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Wastewander Rogue',
 	},
 	[10556] = {
 		spellID = 10556,
@@ -1341,8 +1341,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {14, 8, 2, },
 		source = sources.Item,
 		sourceItemID = 8401,
-		itemSource = sources.Vendors,
-		itemVendors = {5615},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Wastewander Rogue',
 	},
 	[446183] = {
 		spellID = 446183,
@@ -1518,8 +1518,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {6, 6, 1, },
 		source = sources.Item,
 		sourceItemID = 15727,
-		itemSource = sources.Vendors,
-		itemVendors = {5981},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Portal Seeker',
 	},
 	[19052] = {
 		spellID = 19052,
@@ -1529,8 +1529,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {8, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 15728,
-		itemSource = sources.Vendors,
-		itemVendors = {6201},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Legashi Rogue',
 	},
 	[19053] = {
 		spellID = 19053,
@@ -1561,8 +1561,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {6, 1, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 15732,
-		itemSource = sources.Vendors,
-		itemVendors = {7035},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Firegut Brute',
 	},
 	[19060] = {
 		spellID = 19060,
@@ -1572,8 +1572,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {20, 25, 1, },
 		source = sources.Item,
 		sourceItemID = 15733,
-		itemSource = sources.Vendors,
-		itemVendors = {5226},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Murk Worm',
 	},
 	[19061] = {
 		spellID = 19061,
@@ -1615,8 +1615,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {6, 8, 1, },
 		source = sources.Item,
 		sourceItemID = 15738,
-		itemSource = sources.Vendors,
-		itemVendors = {7025},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Blackrock Soldier',
 	},
 	[19065] = {
 		spellID = 19065,
@@ -1626,8 +1626,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {6, 1, 6, 1, },
 		source = sources.Item,
 		sourceItemID = 15739,
-		itemSource = sources.Vendors,
-		itemVendors = {7112},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Jaedenar Cultist',
 	},
 	[19066] = {
 		spellID = 19066,
@@ -1679,8 +1679,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {12, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 15744,
-		itemSource = sources.Vendors,
-		itemVendors = {7107},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Jadefire Trickster',
 	},
 	[19072] = {
 		spellID = 19072,
@@ -1726,8 +1726,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {6, 8, 1, },
 		source = sources.Item,
 		sourceItemID = 15747,
-		itemSource = sources.Vendors,
-		itemVendors = {7440},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Winterfall Den Watcher',
 	},
 	[19075] = {
 		spellID = 19075,
@@ -1737,8 +1737,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {8, 12, 1, },
 		source = sources.Item,
 		sourceItemID = 15748,
-		itemSource = sources.Vendors,
-		itemVendors = {7027},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Blackrock Slayer',
 	},
 	[19076] = {
 		spellID = 19076,
@@ -1748,8 +1748,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {8, 1, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 15749,
-		itemSource = sources.Vendors,
-		itemVendors = {9259},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Firebrand Grunt',
 	},
 	[19077] = {
 		spellID = 19077,
@@ -1770,8 +1770,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {16, 6, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 15752,
-		itemSource = sources.Vendors,
-		itemVendors = {7158},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Deadwood Shaman',
 	},
 	[19079] = {
 		spellID = 19079,
@@ -1781,8 +1781,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {16, 3, 3, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 15753,
-		itemSource = sources.Vendors,
-		itemVendors = {6138},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Arkkoran Oracle',
 	},
 	[19080] = {
 		spellID = 19080,
@@ -1855,8 +1855,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {40, 120, 1, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 15760,
-		itemSource = sources.Vendors,
-		itemVendors = {2644},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Vilebranch Hideskinner',
 	},
 	[23703] = {
 		spellID = 23703,
@@ -1888,8 +1888,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {6, 10, 1, },
 		source = sources.Item,
 		sourceItemID = 15761,
-		itemSource = sources.Vendors,
-		itemVendors = {7441},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Winterfall Totemic',
 	},
 	[19088] = {
 		spellID = 19088,
@@ -1910,8 +1910,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {28, 30, 2, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 15763,
-		itemSource = sources.Vendors,
-		itemVendors = {6146},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Cliff Breaker',
 	},
 	[19090] = {
 		spellID = 19090,
@@ -1921,8 +1921,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {12, 3, 3, 2, 1, },
 		source = sources.Item,
 		sourceItemID = 15764,
-		itemSource = sources.Vendors,
-		itemVendors = {6144},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Son of Arkkoroc',
 	},
 	[20853] = {
 		spellID = 20853,
@@ -1943,8 +1943,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {40, 30, 1, },
 		source = sources.Item,
 		sourceItemID = 15730,
-		itemSource = sources.Vendors,
-		itemVendors = {10363},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'General Drakkisath',
 	},
 	[19091] = {
 		spellID = 19091,
@@ -1964,8 +1964,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {14, 2, 2, },
 		source = sources.Item,
 		sourceItemID = 15768,
-		itemSource = sources.Vendors,
-		itemVendors = {10406},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Ghoul Ravener',
 	},
 	[19093] = {
 		spellID = 19093,
@@ -1985,8 +1985,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {44, 45, 2, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 15770,
-		itemSource = sources.Vendors,
-		itemVendors = {8898},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Anvilrage Marshal',
 	},
 	[19095] = {
 		spellID = 19095,
@@ -1996,8 +1996,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {16, 8, 2, 1, 2, },
 		source = sources.Item,
 		sourceItemID = 15771,
-		itemSource = sources.Vendors,
-		itemVendors = {1813},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Decaying Horror',
 	},
 	[19097] = {
 		spellID = 19097,
@@ -2018,8 +2018,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {20, 2, 6, 4, 2, },
 		source = sources.Item,
 		sourceItemID = 15773,
-		itemSource = sources.Vendors,
-		itemVendors = {10499},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Spectral Researcher',
 	},
 	[19100] = {
 		spellID = 19100,
@@ -2029,8 +2029,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {14, 14, 1, 2, },
 		source = sources.Item,
 		sourceItemID = 15774,
-		itemSource = sources.Vendors,
-		itemVendors = {7029},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Blackrock Battlemaster',
 	},
 	[19101] = {
 		spellID = 19101,
@@ -2040,8 +2040,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {10, 1, 1, 2, },
 		source = sources.Item,
 		sourceItemID = 15775,
-		itemSource = sources.Vendors,
-		itemVendors = {9260},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Firebrand Legionnaire',
 	},
 	[19102] = {
 		spellID = 19102,
@@ -2051,8 +2051,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {22, 4, 16, 1, 2, },
 		source = sources.Item,
 		sourceItemID = 15776,
-		itemSource = sources.Vendors,
-		itemVendors = {11582},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Scholomance Dark Summoner',
 	},
 	[19103] = {
 		spellID = 19103,
@@ -2062,8 +2062,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {16, 4, 18, 1, 2, },
 		source = sources.Item,
 		sourceItemID = 15777,
-		itemSource = sources.Vendors,
-		itemVendors = {10425},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Crimson Battle Mage',
 	},
 	[19104] = {
 		spellID = 19104,
@@ -2073,8 +2073,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {12, 12, 1, 2, },
 		source = sources.Item,
 		sourceItemID = 15779,
-		itemSource = sources.Vendors,
-		itemVendors = {7438},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Winterfall Ursa',
 	},
 	[19107] = {
 		spellID = 19107,
@@ -2084,8 +2084,8 @@ addon.db.Leatherworking = {
 		reagentQuantities = {40, 60, 4, 1, 2, },
 		source = sources.Item,
 		sourceItemID = 15781,
-		itemSource = sources.Vendors,
-		itemVendors = {8903},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Anvilrage Captain',
 	},
 	[20854] = {
 		spellID = 20854,
diff --git a/Source/db/vanilla/Tailoring.lua b/Source/db/vanilla/Tailoring.lua
index c35b2f1..82d73bc 100644
--- a/Source/db/vanilla/Tailoring.lua
+++ b/Source/db/vanilla/Tailoring.lua
@@ -1555,8 +1555,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {5, 3, 1, },
 		source = sources.Item,
 		sourceItemID = 14471,
-		itemSource = sources.Vendors,
-		itemVendors = {5861},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Twilight Fire Guard',
 	},
 	[26085] = {
 		spellID = 26085,
@@ -1588,8 +1588,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {3, 2, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 14473,
-		itemSource = sources.Vendors,
-		itemVendors = {7864},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Lingering Highborne',
 	},
 	[18411] = {
 		spellID = 18411,
@@ -1609,8 +1609,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {4, 3, 1, },
 		source = sources.Item,
 		sourceItemID = 14476,
-		itemSource = sources.Vendors,
-		itemVendors = {5861},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Twilight Fire Guard',
 	},
 	[18413] = {
 		spellID = 18413,
@@ -1650,8 +1650,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {6, 4, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 14480,
-		itemSource = sources.Vendors,
-		itemVendors = {8538},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Unseen Servant',
 	},
 	[18417] = {
 		spellID = 18417,
@@ -1672,8 +1672,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {5, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 14482,
-		itemSource = sources.Vendors,
-		itemVendors = {7037},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Thaurissan Firewalker',
 	},
 	[18419] = {
 		spellID = 18419,
@@ -1704,8 +1704,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {6, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 14485,
-		itemSource = sources.Vendors,
-		itemVendors = {8551},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Dark Summoner',
 	},
 	[18422] = {
 		spellID = 18422,
@@ -1769,8 +1769,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {6, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 14490,
-		itemSource = sources.Vendors,
-		itemVendors = {7037},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Thaurissan Firewalker',
 	},
 	[22813] = {
 		spellID = 22813,
@@ -1788,8 +1788,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {10, 12, 4, 4, 1, },
 		source = sources.Item,
 		sourceItemID = 14493,
-		itemSource = sources.Vendors,
-		itemVendors = {7437},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Cobalt Mageweaver',
 	},
 	[18437] = {
 		spellID = 18437,
@@ -1857,8 +1857,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {6, 4, 1, },
 		source = sources.Item,
 		sourceItemID = 14495,
-		itemSource = sources.Vendors,
-		itemVendors = {10384},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Spectral Citizen',
 	},
 	[18442] = {
 		spellID = 18442,
@@ -1920,8 +1920,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {8, 2, 1, },
 		source = sources.Item,
 		sourceItemID = 14500,
-		itemSource = sources.Vendors,
-		itemVendors = {8526},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Dark Caster',
 	},
 	[18447] = {
 		spellID = 18447,
@@ -1961,8 +1961,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {6, 4, 1, 1, },
 		source = sources.Item,
 		sourceItemID = 14505,
-		itemSource = sources.Vendors,
-		itemVendors = {8526},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Dark Caster',
 	},
 	[18451] = {
 		spellID = 18451,
@@ -2033,8 +2033,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {12, 10, 10, 10, 10, 2, },
 		source = sources.Item,
 		sourceItemID = 14513,
-		itemSource = sources.Vendors,
-		itemVendors = {9264},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Firebrand Pyromancer',
 	},
 	[18458] = {
 		spellID = 18458,
@@ -2044,8 +2044,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {12, 20, 40, 12, 12, 2, },
 		source = sources.Item,
 		sourceItemID = 14514,
-		itemSource = sources.Vendors,
-		itemVendors = {1853},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Darkmaster Gandling',
 	},
 	[20848] = {
 		spellID = 20848,
@@ -2255,8 +2255,8 @@ addon.db.Tailoring = {
 		reagentQuantities = {6, 4, 4, 4, },
 		source = sources.Item,
 		sourceItemID = 22309,
-		itemSource = sources.Vendors,
-		itemVendors = {11487},
+		itemSource = sources.Drop,
+		itemSourceDropName = 'Magister Kalendris',
 	},
 	[27725] = {
 		spellID = 27725,
diff --git a/Source/db/vanilla/vendors.lua b/Source/db/vanilla/vendors.lua
index c0a4121..1b15eff 100644
--- a/Source/db/vanilla/vendors.lua
+++ b/Source/db/vanilla/vendors.lua
@@ -162,10 +162,6 @@ addon.db.Vendors = {
 		zoneID = 4,
 		react = reacts.Ally
 	},
-	[7027] = {
-		name = 'Blackrock Slayer',
-		zoneID = 46,
-	},
 	[10856] = {
 		name = 'Argent Quartermaster Hasana',
 		zoneID = 85,
@@ -198,30 +194,10 @@ addon.db.Vendors = {
 		name = 'Rin\'wosho the Trader',
 		zoneID = 33,
 	},
-	[7428] = {
-		name = 'Frostmaul Giant',
-		zoneID = 618,
-	},
-	[7437] = {
-		name = 'Cobalt Mageweaver',
-		zoneID = 618,
-	},
 	[12944] = {
 		name = 'Lokhtos Darkbargainer',
 		zoneID = 1584,
 	},
-	[10363] = {
-		name = 'General Drakkisath',
-		zoneID = 1583,
-	},
-	[10508] = {
-		name = 'Ras Frostwhisper',
-		zoneID = 2057,
-	},
-	[10339] = {
-		name = 'Gyth',
-		zoneID = 1583,
-	},
 	[9179] = {
 		name = 'Jazzrik',
 		zoneID = 3,
@@ -268,54 +244,6 @@ addon.db.Vendors = {
 		zoneID = 8,
 		react = reacts.Horde
 	},
-	[9028] = {
-		name = 'Grizzle',
-		zoneID = 1584,
-	},
-	[9543] = {
-		name = 'Ribbly Screwspigot',
-		zoneID = 1584,
-	},
-	[4366] = {
-		name = 'Strashaz Serpent Guard',
-		zoneID = 15,
-	},
-	[1836] = {
-		name = 'Scarlet Cavalier',
-		zoneID = 28,
-	},
-	[4364] = {
-		name = 'Strashaz Warrior',
-		zoneID = 15,
-	},
-	[1885] = {
-		name = 'Scarlet Smith',
-		zoneID = 28,
-	},
-	[10438] = {
-		name = 'Maleki the Pallid',
-		zoneID = 2017,
-	},
-	[10899] = {
-		name = 'Goraluk Anvilcrack',
-		zoneID = 1583,
-	},
-	[9736] = {
-		name = 'Quartermaster Zigris',
-		zoneID = 1583,
-	},
-	[1844] = {
-		name = 'Foreman Marcrid',
-		zoneID = 28,
-	},
-	[9596] = {
-		name = 'Bannok Grimaxe',
-		zoneID = 1583,
-	},
-	[10997] = {
-		name = 'Cannon Master Willey',
-		zoneID = 2017,
-	},
 	[15176] = {
 		name = 'Vargus',
 		zoneID = 1377,
@@ -324,14 +252,6 @@ addon.db.Vendors = {
 		name = 'Lieutenant General Andorov',
 		zoneID = 3429,
 	},
-	[15263] = {
-		name = 'The Prophet Skeram',
-		zoneID = 3428,
-	},
-	[15340] = {
-		name = 'Moam',
-		zoneID = 3429,
-	},
 	[1684] = {
 		name = 'Khara Deepwater',
 		zoneID = 38,
@@ -663,10 +583,6 @@ addon.db.Vendors = {
 		name = 'Innkeeper Fizzgrimble',
 		zoneID = 440,
 	},
-	[14354] = {
-		name = 'Pusillin',
-		zoneID = 2557,
-	},
 	[3346] = {
 		name = 'Kithas',
 		zoneID = 1637,
@@ -721,100 +637,24 @@ addon.db.Vendors = {
 		zoneID = 406,
 		react = reacts.Horde
 	},
-	[674] = {
-		name = 'Venture Co. Strip Miner',
-		zoneID = 33,
-	},
 	[4229] = {
 		name = 'Mythrin\'dir',
 		zoneID = 1657,
 		react = reacts.Ally
 	},
-	[2642] = {
-		name = 'Vilebranch Shadowcaster',
-		zoneID = 47,
-	},
-	[9024] = {
-		name = 'Pyromancer Loregrain',
-		zoneID = 1584,
-	},
-	[9025] = {
-		name = 'Lord Roccor',
-		zoneID = 1584,
-	},
 	[4561] = {
 		name = 'Daniel Bartlett',
 		zoneID = 1497,
 		react = reacts.Horde
 	},
-	[6201] = {
-		name = 'Legashi Rogue',
-		zoneID = 16,
-	},
 	[11189] = {
 		name = 'Qia',
 		zoneID = 618,
 	},
-	[9447] = {
-		name = 'Scarlet Warder',
-		zoneID = 139,
-	},
 	[12022] = {
 		name = 'Lorelae Wintersong',
 		zoneID = 493,
 	},
-	[7524] = {
-		name = 'Anguished Highborne',
-		zoneID = 618,
-	},
-	[9452] = {
-		name = 'Scarlet Enchanter',
-		zoneID = 139,
-	},
-	[7372] = {
-		name = 'Deadwind Warlock',
-		zoneID = 41,
-	},
-	[9198] = {
-		name = 'Spirestone Mystic',
-		zoneID = 1583,
-	},
-	[10317] = {
-		name = 'Blackhand Elite',
-		zoneID = 1583,
-	},
-	[10398] = {
-		name = 'Thuzadin Shadowcaster',
-		zoneID = 2017,
-	},
-	[9216] = {
-		name = 'Spirestone Warlord',
-		zoneID = 1583,
-	},
-	[10499] = {
-		name = 'Spectral Researcher',
-		zoneID = 2057,
-	},
-	[4494] = {
-		name = 'Scarlet Spellbinder',
-		zoneID = 28,
-	},
-	[10469] = {
-		name = 'Scholomance Adept',
-		zoneID = 2057,
-	},
-	[10422] = {
-		name = 'Crimson Sorcerer',
-		zoneID = 2017,
-	},
-	[15275] = {
-		name = 'Emperor Vek\'nilash',
-		zoneID = 3428,
-	},
-	[15276] = {
-		name = 'Emperor Vek\'lor',
-		zoneID = 3428,
-	},
 	[6730] = {
 		name = 'Jinky Twizzlefixxit',
 		zoneID = 400,
@@ -895,38 +735,10 @@ addon.db.Vendors = {
 		name = 'Ruppo Zipcoil',
 		zoneID = 47,
 	},
-	[8920] = {
-		name = 'Weapon Technician',
-		zoneID = 1584,
-	},
 	[11185] = {
 		name = 'Xizzer Fizzbolt',
 		zoneID = 618,
 	},
-	[6195] = {
-		name = 'Spitelash Siren',
-		zoneID = 16,
-	},
-	[8897] = {
-		name = 'Doomforge Craftsman',
-		zoneID = 1584,
-	},
-	[10426] = {
-		name = 'Crimson Inquisitor',
-		zoneID = 2017,
-	},
-	[8900] = {
-		name = 'Doomforge Arcanasmith',
-		zoneID = 1584,
-	},
-	[10264] = {
-		name = 'Solakar Flamewreath',
-		zoneID = 1583,
-	},
-	[8561] = {
-		name = 'Mossflayer Shadowhunter',
-		zoneID = 139,
-	},
 	[843] = {
 		name = 'Gina MacGregor',
 		zoneID = 40,
@@ -1021,22 +833,6 @@ addon.db.Vendors = {
 		zoneID = 47,
 		react = reacts.Ally
 	},
-	[5618] = {
-		name = 'Wastewander Bandit',
-		zoneID = 440,
-	},
-	[5617] = {
-		name = 'Wastewander Shadow Mage',
-		zoneID = 440,
-	},
-	[5616] = {
-		name = 'Wastewander Thief',
-		zoneID = 440,
-	},
-	[5615] = {
-		name = 'Wastewander Rogue',
-		zoneID = 440,
-	},
 	[12956] = {
 		name = 'Zannok Hidepiercer',
 		zoneID = 1377,
@@ -1055,54 +851,14 @@ addon.db.Vendors = {
 		name = 'Masat T\'andr',
 		zoneID = 8,
 	},
-	[5981] = {
-		name = 'Portal Seeker',
-		zoneID = 4,
-	},
 	[12957] = {
 		name = 'Blimo Gadgetspring',
 		zoneID = 16,
 	},
-	[7035] = {
-		name = 'Firegut Brute',
-		zoneID = 46,
-	},
-	[5226] = {
-		name = 'Murk Worm',
-		zoneID = 1477,
-	},
 	[12958] = {
 		name = 'Gigget Zipcoil',
 		zoneID = 47,
 	},
-	[7025] = {
-		name = 'Blackrock Soldier',
-		zoneID = 46,
-	},
-	[7112] = {
-		name = 'Jaedenar Cultist',
-		zoneID = 361,
-	},
-	[7107] = {
-		name = 'Jadefire Trickster',
-		zoneID = 361,
-	},
-	[7440] = {
-		name = 'Winterfall Den Watcher',
-		zoneID = 618,
-	},
-	[9259] = {
-		name = 'Firebrand Grunt',
-		zoneID = 1583,
-	},
-	[7158] = {
-		name = 'Deadwood Shaman',
-		zoneID = 361,
-	},
-	[6138] = {
-		name = 'Arkkoran Oracle',
-		zoneID = 16,
-	},
 	[12941] = {
 		name = 'Jase Farlane',
 		zoneID = 139,
@@ -1111,58 +867,6 @@ addon.db.Vendors = {
 		name = 'Nergal',
 		zoneID = 490,
 	},
-	[2644] = {
-		name = 'Vilebranch Hideskinner',
-		zoneID = 47,
-	},
-	[7441] = {
-		name = 'Winterfall Totemic',
-		zoneID = 618,
-	},
-	[6146] = {
-		name = 'Cliff Breaker',
-		zoneID = 16,
-	},
-	[6144] = {
-		name = 'Son of Arkkoroc',
-		zoneID = 16,
-	},
-	[10406] = {
-		name = 'Ghoul Ravener',
-		zoneID = 2017,
-	},
-	[8898] = {
-		name = 'Anvilrage Marshal',
-		zoneID = 1584,
-	},
-	[1813] = {
-		name = 'Decaying Horror',
-		zoneID = 28,
-	},
-	[7029] = {
-		name = 'Blackrock Battlemaster',
-		zoneID = 46,
-	},
-	[9260] = {
-		name = 'Firebrand Legionnaire',
-		zoneID = 1583,
-	},
-	[11582] = {
-		name = 'Scholomance Dark Summoner',
-		zoneID = 2057,
-	},
-	[10425] = {
-		name = 'Crimson Battle Mage',
-		zoneID = 2017,
-	},
-	[7438] = {
-		name = 'Winterfall Ursa',
-		zoneID = 618,
-	},
-	[8903] = {
-		name = 'Anvilrage Captain',
-		zoneID = 1584,
-	},
 	[15293] = {
 		name = 'Aendel Windspear',
 		zoneID = 1377,
@@ -1285,52 +989,12 @@ addon.db.Vendors = {
 		name = 'Darnall',
 		zoneID = 493,
 	},
-	[5861] = {
-		name = 'Twilight Fire Guard',
-		zoneID = 51,
-	},
-	[7864] = {
-		name = 'Lingering Highborne',
-		zoneID = 16,
-	},
-	[8538] = {
-		name = 'Unseen Servant',
-		zoneID = 139,
-	},
-	[7037] = {
-		name = 'Thaurissan Firewalker',
-		zoneID = 46,
-	},
-	[8551] = {
-		name = 'Dark Summoner',
-		zoneID = 139,
-	},
 	[15179] = {
 		name = 'Mishta',
 		zoneID = 1377,
 	},
-	[10384] = {
-		name = 'Spectral Citizen',
-		zoneID = 2017,
-	},
-	[8526] = {
-		name = 'Dark Caster',
-		zoneID = 139,
-	},
-	[9264] = {
-		name = 'Firebrand Pyromancer',
-		zoneID = 1583,
-	},
-	[1853] = {
-		name = 'Darkmaster Gandling',
-		zoneID = 2057,
-	},
 	[14371] = {
 		name = 'Shen\'dralar Provisioner',
 		zoneID = 2557,
 	},
-	[11487] = {
-		name = 'Magister Kalendris',
-		zoneID = 2557,
-	},
 }
\ No newline at end of file
diff --git a/Source/enums.lua b/Source/enums.lua
index a237995..cbd83ef 100644
--- a/Source/enums.lua
+++ b/Source/enums.lua
@@ -39,6 +39,7 @@ addon.Enums.Sources.Vendors = 5
 addon.Enums.Sources.WorldDrop = 6
 addon.Enums.Sources.Quest = 7
 addon.Enums.Sources.ZoneDrop = 8
+addon.Enums.Sources.Drop = 9
 
 addon.Strings.Sources = {}
 addon.Strings.Sources.Trainer = TUTORIAL_TITLE14
@@ -49,6 +50,6 @@ addon.Strings.Sources.Vendors = TUTORIAL_TITLE20
 addon.Strings.Sources.WorldDrop = TRANSMOG_SOURCE_4
 addon.Strings.Sources.Quest = LOOT_JOURNAL_LEGENDARIES_SOURCE_QUEST
 addon.Strings.Sources.ZoneDrop = ZONE
-
+addon.Strings.Sources.Drop = BATTLE_PET_SOURCE_1
 
 addon.db = {}
diff --git a/Source/util.lua b/Source/util.lua
index 001f10b..0c93499 100644
--- a/Source/util.lua
+++ b/Source/util.lua
@@ -55,6 +55,8 @@ function addon.GetRecipeRequirementText(data, itemCallback)
             source = addon.Strings.Sources.Quest
         elseif data.itemSource == sources.ZoneDrop then
             source = addon.Strings.Sources.ZoneDrop
+        elseif data.itemSource == sources.Drop then
+            source = addon.Strings.Sources.Drop .. " " .. data.itemSourceDropName
         else
             source = "[NYI] " .. data.itemSource 
         end
@@ -105,7 +107,7 @@ function addon.GetRecipeDB(professionName, getCraftInfoFunc, currentSkill, inclu
             if data.source == sources.Trainer then
                 table.insert(trainerDB, data)
             elseif data.source == sources.Item then
-                if data.itemSource == sources.WorldDrop then
+                if (data.itemSource == sources.WorldDrop) or (data.itemSource == sources.Drop) then
                     table.insert(recipeWorldDropDB, data)
                 elseif data.itemSource == sources.Vendors then
                     table.insert(recipeVendorDB, data)