diff --git a/.pkgmeta b/.pkgmeta
index 6d2b1e2..a885a94 100644
--- a/.pkgmeta
+++ b/.pkgmeta
@@ -3,6 +3,7 @@ package-as: ChoreTracker
 externals:
 	Libs/LibStub: svn://svn.wowace.com/wow/libstub/mainline/trunk
 	Libs/AceAddon-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceAddon-3.0
+	Libs/CallbackHandler-1.0: svn://svn.wowace.com/wow/callbackhandler/mainline/trunk/CallbackHandler-1.0
 	Libs/AceConsole-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceConsole-3.0
 	Libs/AceDB-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceDB-3.0
 	Libs/AceEvent-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceEvent-3.0
diff --git a/ChoreTracker.lua b/ChoreTracker.lua
index f0b5297..48863f8 100644
--- a/ChoreTracker.lua
+++ b/ChoreTracker.lua
@@ -66,7 +66,7 @@ end
 
 function core:OnEnable()
 	LibQTip = LibStub('LibQTip-1.0')
-	LoadAddOn("Blizzard_Calendar")
+	LoadAddOn('Blizzard_Calendar')
 
 	for class,color in pairs(RAID_CLASS_COLORS) do
 		class = class:lower()
@@ -92,11 +92,11 @@ function core:OnEnable()
 	core:ResetValorPoints()
 	
 	-- Setup LDB
-	self.LDB = LibStub("LibDataBroker-1.1"):NewDataObject("ChoreTracker", {
-		type = "data source",
-		text = "ChoreTracker",
-		icon = "Interface\\AddOns\\ChoreTracker\\icon",
-		OnClick = function() print("ChoreTracker test") end,
+	self.LDB = LibStub('LibDataBroker-1.1'):NewDataObject('ChoreTracker', {
+		type = 'data source',
+		text = 'ChoreTracker',
+		icon = 'Interface\\AddOns\\ChoreTracker\\icon',
+		OnClick = function() print('ChoreTracker test') end,
 		OnEnter = function(self) 
 			local columnCount = 2
 			for instance,abbreviation in pairs(trackedInstances) do
@@ -116,13 +116,13 @@ function core:OnEnable()
 	})
 	
 	-- Deal with minimap
-	self.LDBIcon = LibStub("LibDBIcon-1.0")
-	self.LDBIcon:Register("ChoreTracker", self.LDB, self.db.profile.minimap)
+	self.LDBIcon = LibStub('LibDBIcon-1.0')
+	self.LDBIcon:Register('ChoreTracker', self.LDB, self.db.profile.minimap)
 	
 	if self.db.profile.minimap.hide then
-		self.LDBIcon:Hide("ChoreTracker")
+		self.LDBIcon:Hide('ChoreTracker')
 	else
-		self.LDBIcon:Show("ChoreTracker")
+		self.LDBIcon:Show('ChoreTracker')
 	end
 end
 
diff --git a/ChoreTracker.toc b/ChoreTracker.toc
index 96ef6f4..64158c0 100644
--- a/ChoreTracker.toc
+++ b/ChoreTracker.toc
@@ -8,6 +8,7 @@
 ## OptionalDeps: LibQTip-1.0, LibDBIcon-1.0
 
 Libs\LibStub\LibStub.lua
+Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
 Libs\AceAddon-3.0\AceAddon-3.0.xml
 Libs\AceConsole-3.0\AceConsole-3.0.xml
 Libs\AceDB-3.0\AceDB-3.0.xml