diff --git a/LICENSE.txt b/LICENSE.txt
index dea2283..414e47c 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,2 +1,2 @@
 All Rights Reserved unless otherwise explicitly stated.
-Copyright (c) 2013-2017 Paweł Jastrzębski <pawelj@iosphe.re>
+Copyright (c) 2013-2018 Paweł Jastrzębski <pawelj@iosphe.re>
diff --git a/README.md b/README.md
index d028942..35d25a9 100644
--- a/README.md
+++ b/README.md
@@ -8,4 +8,4 @@
 
 All Rights Reserved unless otherwise explicitly stated.
 
-Copyright (c) 2013-2017 Paweł Jastrzębski <pawelj@iosphe.re>
+Copyright (c) 2013-2018 Paweł Jastrzębski <pawelj@iosphe.re>
diff --git a/REKeys.lua b/REKeys.lua
index 8b12961..a774c0c 100644
--- a/REKeys.lua
+++ b/REKeys.lua
@@ -1,10 +1,10 @@
 local _G = _G
-_G.REKeysNamespace = {["AceBucket"] = {}}
-local RE = REKeysNamespace
+local _, RE = ...
 local LDB = LibStub("LibDataBroker-1.1")
 local QTIP = LibStub("LibQTip-1.0")
+local BUCKET = LibStub("AceBucket-3.0")
 local L = LibStub("AceLocale-3.0"):GetLocale("REKeys")
-LibStub("AceBucket-3.0"):Embed(RE.AceBucket)
+_G.REKeys = RE
 
 --GLOBALS: SLASH_REKEYS1, SLASH_REKEYS2, NUM_BAG_SLOTS, RAID_CLASS_COLORS, Game15Font, Game18Font, GameTooltipHeaderText
 local strsplit, pairs, ipairs, select, sbyte, sformat, strfind, time, date, tonumber, fastrandom, wipe, sort, tinsert, next, print, unpack = _G.strsplit, _G.pairs, _G.ipairs, _G.select, _G.string.byte, _G.string.format, _G.strfind, _G.time, _G.date, _G.tonumber, _G.fastrandom, _G.wipe, _G.sort, _G.tinsert, _G.next, _G.print, _G.unpack
@@ -535,12 +535,12 @@ end
 function RE:KeySearchDelay()
 	RE.BestRun = RE:GetBestRun()
 	RE:FindKey()
-	_G.REKeys:RegisterEvent("CHALLENGE_MODE_COMPLETED")
-	_G.REKeys:RegisterEvent("QUEST_ACCEPTED")
-	RE.AceBucket:RegisterBucketEvent("BAG_UPDATE", 2, RE.FindKey)
+	_G.REKeysFrame:RegisterEvent("CHALLENGE_MODE_COMPLETED")
+	_G.REKeysFrame:RegisterEvent("QUEST_ACCEPTED")
+	BUCKET:RegisterBucketEvent("BAG_UPDATE", 2, RE.FindKey)
 	if IsAddOnLoaded("RaiderIO") then
 		RE.RaiderIO = true
-		_G.REKeys:RegisterEvent("MODIFIER_STATE_CHANGED")
+		_G.REKeysFrame:RegisterEvent("MODIFIER_STATE_CHANGED")
 	end
 end
 
diff --git a/REKeys.toc b/REKeys.toc
index a1c2a72..935107c 100644
--- a/REKeys.toc
+++ b/REKeys.toc
@@ -1,7 +1,7 @@
 ## Interface: 70300
 ## Title: |cFF74D06CRE|rKeys
 ## Notes: Collect information about keystones owned by your friends.
-## Version: 1.3.4
+## Version: 1.3.5
 ## Author: AcidWeb
 ## SavedVariables: REKeysDB, REKeysSettings
 
diff --git a/REKeys.xml b/REKeys.xml
index de5f89b..7e102ec 100644
--- a/REKeys.xml
+++ b/REKeys.xml
@@ -1,11 +1,11 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
 
 	<Script file="REKeys.lua"/>
-	
-	<Frame name="REKeys">
+
+	<Frame name="REKeysFrame">
 		<Scripts>
-			<OnLoad>REKeysNamespace:OnLoad(self)</OnLoad>
-			<OnEvent>REKeysNamespace:OnEvent(self, event, ...)</OnEvent>
+			<OnLoad>REKeys:OnLoad(self)</OnLoad>
+			<OnEvent>REKeys:OnEvent(self, event, ...)</OnEvent>
 		</Scripts>
 	</Frame>