diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua
index 9425acdd..4eea9d95 100644
--- a/Libs/DF/fw.lua
+++ b/Libs/DF/fw.lua
@@ -4518,19 +4518,18 @@ end
 --key is instanceId from GetInstanceInfo()
 -- /dump GetInstanceInfo()
 DF.BattlegroundSizes = {
-	[2245] = 15, --Deepwind Gorge
-	[2106] = 10, --Warsong Gulch
-	[2107] = 15, --Arathi Basin
+	[489] = 10, --Warsong Gulch
+	[1682] = 10, --Warsong Gulch (Winter)
+	[529] = 15, --Arathi Basin
+	[1681] = 15, --Arathi Basin (Winter)
 	[566] = 15, --Eye of the Storm
 	[30]  = 40,	--Alterac Valley
-	[628] = 40, --Isle of Conquest
-	[761] = 10, --The Battle for Gilneas
+	[628] = 40, --Isle of conquest
 	[726] = 10, --Twin Peaks
-	[727] = 10, --Silvershard Mines
 	[998] = 10, --Temple of Kotmogu
-	[2118] = 40, --Battle for Wintergrasp
-	[1191] = 25, --Ashran
-	[1803] = 10, --Seething Shore
+	[800] = 100, --???
+	[1280] = 40, --Southshore vs. Tarren Mill
+	[3000] = 40, --TestBG [Alterac Valley]
 }
 
 function DF:GetBattlegroundSize(instanceInfoMapId)
diff --git a/boot.lua b/boot.lua
index fd4cd0ea..f7106a00 100644
--- a/boot.lua
+++ b/boot.lua
@@ -519,9 +519,41 @@ do
 			}
 
 		--current instances of the exp (need to maintain)
-			_detalhes.InstancesToStoreData = { --mapId
-				[2549] = true, --amirdrassil
-			}
+			local expansion = GetExpansionLevel()
+			if expansion == Enum.Expansion.TBC then
+				_detalhes.InstancesToStoreData = { --GetActiveMapID()
+					[532] = true, --Karazhan 
+					[565] = true, --Gruul's Lair
+					[544] = true, --Magtheridon's Lair
+					[548] = true, --Serpentshrine Cavern
+					[550] = true, --Tempest Keep
+					[534] = true, --Battle for Mount Hyjal
+					[564] = true, --Black Temple
+					[580] = true, --Sunwell Plateau
+				}
+			elseif expansion == Enum.Expansion.WoTLK then
+				_detalhes.InstancesToStoreData = { --GetActiveMapID()
+					[533] = true, --Naxxramas 
+					[615] = true, --Obsidian Sanctum
+					[616] = true, --Eye of Eternity
+					[624] = true, --Vault of Achavon
+					[603] = true, --Ulduar
+					[249] = true, --Onyxia's Lair
+					[649] = true, --Trial of the Crusader
+					[631] = true, --Icecrown Citadel
+					[724] = true, --Ruby Sanctum
+				}
+			else -- vanilla
+				_detalhes.InstancesToStoreData = { --GetActiveMapID()
+					[409] = true, --Molten Core
+					[469] = true, --Blackwing Lair
+					[249] = true, --Onyxia's Lair
+					[509] = true, --Ruins of Ahn'Qiraj
+					[531] = true, --Temple of Ahn'Qiraj
+					[533] = true, --Naxxramas 
+				}
+			end
+			
 
 		--store shield information for absorbs
 			_detalhes.ShieldCache = {}
diff --git a/core/gears.lua b/core/gears.lua
index 1dc95cc7..f332d783 100644
--- a/core/gears.lua
+++ b/core/gears.lua
@@ -1550,8 +1550,7 @@ function Details.Database.StoreWipe(combat)
 		return
 	end
 
-	local name, type, difficulty, difficultyName, maxPlayers, playerDifficulty, isDynamicInstance, mapID, instanceGroupSize = GetInstanceInfo()
-	local bossCLEUID = combat.boss_info and combat.boss_info.id
+	local _, _, _, _, _, _, _, mapID = GetInstanceInfo()
 
 	if (not instancesToStoreData[mapID]) then
 		if (_detalhes.debug) then
@@ -1619,8 +1618,7 @@ function Details.Database.StoreEncounter(combat)
 		return
 	end
 
-	local name, type, difficulty, difficultyName, maxPlayers, playerDifficulty, isDynamicInstance, mapID, instanceGroupSize = GetInstanceInfo()
-	local bossCLEUID = combat.boss_info and combat.boss_info.id
+	local _, _, _, _, _, _, _, mapID = GetInstanceInfo()
 
 	if (not instancesToStoreData[mapID]) then
 		if (_detalhes.debug) then