diff --git a/modules/HolyPower.lua b/modules/HolyPower.lua
index e66d395..99332e8 100644
--- a/modules/HolyPower.lua
+++ b/modules/HolyPower.lua
@@ -134,7 +134,7 @@ end
 
 -- Load us up
 local _, unitClass = UnitClass("player")
-if (unitClass == "PALADIN" and IceHUD.WowVer >= 40000) then
+if (unitClass == "PALADIN" and (PaladinPowerBar or PaladinPowerBarFrame)) then
 	IceHUD.HolyPower = HolyPower:new()
 end
 
diff --git a/modules/ShadowOrbs.lua b/modules/ShadowOrbs.lua
index 414b8d8..6806dc8 100644
--- a/modules/ShadowOrbs.lua
+++ b/modules/ShadowOrbs.lua
@@ -103,7 +103,7 @@ end
 
 -- Load us up
 local _, unitClass = UnitClass("player")
-if (unitClass == "PRIEST" and IceHUD.WowVer >= 50000 and IceHUD.WowVer < 70000) then
+if (unitClass == "PRIEST" and PriestBarFrame) then
 	IceHUD.ShadowOrbs = ShadowOrbs:new()
 end
 
diff --git a/modules/Shards.lua b/modules/Shards.lua
index aa1c03d..30c4a4a 100644
--- a/modules/Shards.lua
+++ b/modules/Shards.lua
@@ -276,6 +276,6 @@ end
 
 -- Load us up
 local _, unitClass = UnitClass("player")
-if (unitClass == "WARLOCK" and IceHUD.WowVer >= 40000) then
+if (unitClass == "WARLOCK" and WarlockPowerFrame) then
 	IceHUD.ShardCounter = ShardCounter:new()
 end