diff --git a/api/unitframes.lua b/api/unitframes.lua
index 0216f060..2efc9455 100644
--- a/api/unitframes.lua
+++ b/api/unitframes.lua
@@ -4,26 +4,6 @@ pfUI.uf.frames = {}
 -- load pfUI environment
 setfenv(1, pfUI:GetEnvironment())
 
-local pfValidUnits = {}
-pfValidUnits["player"] = true
-pfValidUnits["target"] = true
-pfValidUnits["pet"] = true
-pfValidUnits["mouseover"] = true
-
-pfValidUnits["player" .. "target"] = true
-pfValidUnits["target" .. "target"] = true
-pfValidUnits["pet" .. "target"] = true
-
-for i=1,4 do pfValidUnits["party" .. i] = true end
-for i=1,4 do pfValidUnits["partypet" .. i] = true end
-for i=1,40 do pfValidUnits["raid" .. i] = true end
-for i=1,40 do pfValidUnits["raidpet" .. i] = true end
-
-for i=1,4 do pfValidUnits["party" .. i .. "target"] = true end
-for i=1,4 do pfValidUnits["partypet" .. i .. "target"] = true end
-for i=1,40 do pfValidUnits["raid" .. i .. "target"] = true end
-for i=1,40 do pfValidUnits["raidpet" .. i .. "target"] = true end
-
 local glow = {
   edgeFile = pfUI.media["img:glow"], edgeSize = 8,
   insets = {left = 0, right = 0, top = 0, bottom = 0},
diff --git a/env/tables.lua b/env/tables.lua
index d7eb8f73..137cf0a9 100644
--- a/env/tables.lua
+++ b/env/tables.lua
@@ -45,6 +45,29 @@ pfGridmath = {
   [12] = {{12,1},{6,2},{4,3},{3,4},{2,6},{1,12}}
 }
 
+-- list of valid unitstrings
+pfValidUnits = {}
+pfValidUnits["pet"] = true
+pfValidUnits["player"] = true
+pfValidUnits["target"] = true
+pfValidUnits["mouseover"] = true
+
+pfValidUnits["pettarget"] = true
+pfValidUnits["playertarget"] = true
+pfValidUnits["targettarget"] = true
+pfValidUnits["mouseovertarget"] = true
+pfValidUnits["targettargettarget"] = true
+
+for i=1,4 do pfValidUnits["party" .. i] = true end
+for i=1,4 do pfValidUnits["partypet" .. i] = true end
+for i=1,40 do pfValidUnits["raid" .. i] = true end
+for i=1,40 do pfValidUnits["raidpet" .. i] = true end
+
+for i=1,4 do pfValidUnits["party" .. i .. "target"] = true end
+for i=1,4 do pfValidUnits["partypet" .. i .. "target"] = true end
+for i=1,40 do pfValidUnits["raid" .. i .. "target"] = true end
+for i=1,40 do pfValidUnits["raidpet" .. i .. "target"] = true end
+
 -- itemid = "sell,buy"
 pfSellData = {
   [25]="7,35", [35]="9,47", [36]="7,38", [37]="7,38", [38]="1,1", [39]="1,5",