diff --git a/module_bank.lua b/module_bank.lua
index 533fb39..5c5716a 100755
--- a/module_bank.lua
+++ b/module_bank.lua
@@ -20,7 +20,7 @@ function modul.Guess(id)
 		local dif = dbcount - count
 		modul['db'][playerID] = modul['db'][playerID] or {}
 		local tab = modul['db'][playerID]
-		for bag = 5, GetNumBankSlots() + 4 do
+		for bag = Enum.BagIndex.BankBag_1 ,Enum.BagIndex.BankBag_1 + GetNumBankSlots() - 1 do
 			local btab = tab[bag]
 			if(btab and btab[id] and btab[id]['count'] > 0) then
 				while(dif > 0 and btab[id]['count'] > 0) do
@@ -54,7 +54,7 @@ local function scanAllBankBags(delayed)
 	if(playerID) then
 		modul['db'][playerID] = modul['db'][playerID] or {}
 		local tab = modul['db'][playerID]
-		for bag=5,GetNumBankSlots()+4 do
+		for bag = Enum.BagIndex.BankBag_1 ,Enum.BagIndex.BankBag_1 + GetNumBankSlots() - 1 do
 			tab[bag] = tab[bag] or {}
 			if(BankIsOpen) then
 				tab[bag] = child:scanBag(bag) -- loop all bought bankbags
@@ -63,13 +63,13 @@ local function scanAllBankBags(delayed)
 			end
 		end
 		if(BankIsOpen) then
-			tab[-1] = child:scanBag(-1) -- Main bankbag
+			tab[Enum.BagIndex.Bank] = child:scanBag(Enum.BagIndex.Bank) -- Main bankbag
 		else
-			guess(tab[-1])
+			guess(tab[Enum.BagIndex.Bank])
 		end
-		tab[-3] = child:scanBag(-3) -- Main reagentbag
+		tab[Enum.BagIndex.Reagentbank] = child:scanBag(Enum.BagIndex.Reagentbank) -- Main reagentbag
 		for k,v in pairs(modul['db'][playerID]) do
-			if(not(k == -1) and not(k == -3) and not(k > 4 and k <= GetNumBankSlots() + 4)) then
+			if(not(k == Enum.BagIndex.Bank) and not(k == Enum.BagIndex.Reagentbank) and not(k > Enum.BagIndex.ReagentBag and k <= GetNumBankSlots() + Enum.BagIndex.ReagentBag)) then
 				tab[k] = nil -- prevent bogus bankbags
 			end
 		end
@@ -85,7 +85,7 @@ local function bagLoop(id, res)
 			if(playerID and units[k]['faction'] == units[playerID]['faction']) then
 				local unitname = units[k]['name']
 				for bag, list in pairs(v) do
-					dName = (bag == -3) and desc2 or desc
+					dName = (bag == Enum.BagIndex.Reagentbank) and desc2 or desc
 					for a, b in pairs(list) do
 						if(a == id) then
 							res[unitname] = res[unitname] or {