diff --git a/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Mount Hyjal.lua b/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Mount Hyjal.lua
index 93e8c390ca7..70f03e8ac09 100644
--- a/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Mount Hyjal.lua	
+++ b/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Mount Hyjal.lua	
@@ -7,7 +7,6 @@ root(ROOTS.Zones, m(KALIMDOR, {
 		["icon"] = 409547,
 		["timeline"] = { ADDED_4_0_3 },
 		["maps"] = {
-			738,	-- Firelands
 			760,	-- Malorne's Nightmare
 		},
 		["groups"] = {
diff --git a/.contrib/Parser/DATAS/06 - Expansion Features/06 Legion/Legion Class Halls/Shaman/Firelands.lua b/.contrib/Parser/DATAS/06 - Expansion Features/06 Legion/Legion Class Halls/Shaman/Firelands.lua
new file mode 100644
index 00000000000..27523340bf0
--- /dev/null
+++ b/.contrib/Parser/DATAS/06 - Expansion Features/06 Legion/Legion Class Halls/Shaman/Firelands.lua	
@@ -0,0 +1,16 @@
+-------------------------------------------------------------------
+--      E X P A N S I O N   F E A T U R E S    M O D U L E       --
+-------------------------------------------------------------------
+
+root(ROOTS.ExpansionFeatures, expansion(EXPANSION.LEGION, bubbleDown({ ["timeline"] = { ADDED_7_0_3 } },{
+    n(CLASS_HALL, {
+        cl(SHAMAN, bubbleDown({ ["classes"] = { SHAMAN } }, {
+            m(THE_HEART_OF_AZEROTH_FIRELANDS, {
+                ["lore"] = "The death of Ragnaros has left the Firelands in utter chaos. The elementals residing there became engaged in an epic battle for supremacy. Eventually Smolderon and Pyroth, the son of Lord Rhyolith, would emerge as the top contenders for the position of Firelord.",
+                ["coord"] = { 31.0, 61.0, THE_HEART_Of_AZEROTH },
+                ["timeline"] = { ADDED_7_0_3 },
+                ["icon"] = 529270,
+            })
+        }))
+    })
+})));
\ No newline at end of file
diff --git a/.contrib/Parser/DATAS/06 - Expansion Features/06 Legion/Legion Class Halls/The Heart Of Azeroth (Shaman).lua b/.contrib/Parser/DATAS/06 - Expansion Features/06 Legion/Legion Class Halls/Shaman/The Heart Of Azeroth (Shaman).lua
similarity index 99%
rename from .contrib/Parser/DATAS/06 - Expansion Features/06 Legion/Legion Class Halls/The Heart Of Azeroth (Shaman).lua
rename to .contrib/Parser/DATAS/06 - Expansion Features/06 Legion/Legion Class Halls/Shaman/The Heart Of Azeroth (Shaman).lua
index 914d58f7de1..8baf664b248 100644
--- a/.contrib/Parser/DATAS/06 - Expansion Features/06 Legion/Legion Class Halls/The Heart Of Azeroth (Shaman).lua	
+++ b/.contrib/Parser/DATAS/06 - Expansion Features/06 Legion/Legion Class Halls/Shaman/The Heart Of Azeroth (Shaman).lua	
@@ -519,23 +519,24 @@ root(ROOTS.ExpansionFeatures, expansion(EXPANSION.LEGION, bubbleDown({ ["timelin
 							42208,	-- Return to the Firelands
 							42990,	-- Neltharion's Lair: The Earthen Amulet
 						},
+						["maps"] = { THE_HEART_OF_AZEROTH_FIRELANDS },
 						["provider"] = { "n", 96746 },	-- Advisor Sevel
 						["coord"] = { 33.0, 60.0, THE_HEART_Of_AZEROTH },
 					}),
 					q(41773, {	-- The Firelord's Command
 						["sourceQuests"] = { 41772 },	-- Ascendant of Flames
 						["provider"] = { "n", 105055 },	-- Baron Scaldius
-						["maps"] = { 738 },	-- Firelands (Scenario Map)
+						["maps"] = { THE_HEART_OF_AZEROTH_FIRELANDS },	-- Firelands (Scenario Map)
 					}),
 					q(41934, {	-- The Brand of Damnation
 						["sourceQuests"] = { 41773 },	-- The Firelord's Command
 						["provider"] = { "n", 105120 },	-- Lord Smolderon
-						["maps"] = { 738 },	-- Firelands (Scenario Map)
+						["maps"] = { THE_HEART_OF_AZEROTH_FIRELANDS },	-- Firelands (Scenario Map)
 					}),
 					q(41888, {	-- Allegiance of Flame
 						["sourceQuests"] = { 41934 },	-- The Brand of Damnation
 						["provider"] = { "n", 105594 },	-- Lord Smolderon
-						["maps"] = { 738 },	-- Firelands (Scenario Map)
+						["maps"] = { THE_HEART_OF_AZEROTH_FIRELANDS },	-- Firelands (Scenario Map)
 						["g"] = {
 							i(139698),	-- Farseer's Harness
 							title(336),	-- Farseer <Name>
diff --git a/.contrib/Parser/lib/Constants/Maps.lua b/.contrib/Parser/lib/Constants/Maps.lua
index 09cc17e4832..d4d7cad3f1c 100644
--- a/.contrib/Parser/lib/Constants/Maps.lua
+++ b/.contrib/Parser/lib/Constants/Maps.lua
@@ -334,6 +334,7 @@ SHADOWMOON_VALLEY = 104;
 -- #endif
 
 -- Cataclysm
+FIRELANDS = 367
 MOUNT_HYJAL = 198;
 DARKMOON_ISLAND = 407;
 DEEPHOLM = 207;
@@ -423,6 +424,7 @@ SKYHOLD = 695;
 THE_DREAMGROVE = 747;
 THE_HALL_OF_SHADOWS = 626;
 THE_HEART_Of_AZEROTH = 726;
+THE_HEART_OF_AZEROTH_FIRELANDS = 738;
 THE_WANDERING_ISLE = 709;
 TRUESHOT_LODGE = 739;
 CLASS_HALL_MAPS = {