diff --git a/DeathReporter.lua b/DeathReporter.lua
index a4e7206..c013d2d 100644
--- a/DeathReporter.lua
+++ b/DeathReporter.lua
@@ -2,6 +2,7 @@ local addonname, shared = ...
 ---@cast shared HeimdallShared
 ---@cast addonname string
 
+---@diagnostic disable-next-line: missing-fields
 shared.DeathReporter = {}
 function shared.DeathReporter.Init()
 --	if not Heimdall_Data.config.deathReporter.enabled then
diff --git a/DumpTable.lua b/DumpTable.lua
index b1dd601..dc92647 100644
--- a/DumpTable.lua
+++ b/DumpTable.lua
@@ -1,11 +1,11 @@
-local addonname, data = ...
----@cast data HeimdallData
+local addonname, shared = ...
+---@cast shared HeimdallShared
 ---@cast addonname string
 
-if not data.dumpTable then
+if not shared.dumpTable then
 	---@param table table
 	---@param depth number?
-	data.dumpTable = function(table, depth)
+	shared.dumpTable = function(table, depth)
 		if not table then
 			print(tostring(table))
 			return
@@ -20,7 +20,7 @@ if not data.dumpTable then
 		for k, v in pairs(table) do
 			if (type(v) == "table") then
 				print(string.rep("  ", depth) .. k .. ":")
-				data.dumpTable(v, depth + 1)
+				shared.dumpTable(v, depth + 1)
 			else
 				print(string.rep("  ", depth) .. k .. ": ", v)
 			end
diff --git a/Heimdall.lua b/Heimdall.lua
index cb37022..aafc097 100644
--- a/Heimdall.lua
+++ b/Heimdall.lua
@@ -12,6 +12,8 @@ local function init()
     ---@field config HeimdallConfig
     ---@field stinkies table<string, boolean>
     if not Heimdall_Data then Heimdall_Data = {} end
+    ---@class InitTable
+    ---@field Init fun(): nil
 
     ---@class HeimdallShared
     ---@field raceMap table<string, string>
@@ -22,11 +24,11 @@ local function init()
     ---@field utf8len fun(input: string): number
     ---@field padString fun(input: string, targetLength: number, left?: boolean): string
     ---@field GetOrDefault fun(table: table<any, any>, keys: string[], default: any): any
-    ---@field Whoer { Init: fun() }
-    ---@field Messenger { Init: fun() }
-    ---@field Spotter { Init: fun() }
-    ---@field DeathReporter { Init: fun() }
-    ---@field Inviter { Init: fun() }
+    ---@field Whoer InitTable
+    ---@field Messenger InitTable
+    ---@field Spotter InitTable
+    ---@field DeathReporter InitTable
+    ---@field Inviter InitTable
 
     --- Config ---
     ---@class HeimdallConfig
diff --git a/Inviter.lua b/Inviter.lua
index 0017132..0cff790 100644
--- a/Inviter.lua
+++ b/Inviter.lua
@@ -2,6 +2,7 @@ local addonname, shared = ...
 ---@cast shared HeimdallShared
 ---@cast addonname string
 
+---@diagnostic disable-next-line: missing-fields
 shared.Inviter = {}
 function shared.Inviter.Init()
 	--	if not Heimdall_Data.config.inviter.enabled then
diff --git a/Messenger.lua b/Messenger.lua
index 3afde0a..ed12622 100644
--- a/Messenger.lua
+++ b/Messenger.lua
@@ -2,6 +2,7 @@ local addonname, shared = ...
 ---@cast shared HeimdallShared
 ---@cast addonname string
 
+---@diagnostic disable-next-line: missing-fields
 shared.Messenger = {}
 function shared.Messenger.Init()
 	--	if not Heimdall_Data.config.messenger.enabled then
diff --git a/Spotter.lua b/Spotter.lua
index 2e47a5a..93174fb 100644
--- a/Spotter.lua
+++ b/Spotter.lua
@@ -2,6 +2,7 @@ local addonname, shared = ...
 ---@cast shared HeimdallShared
 ---@cast addonname string
 
+---@diagnostic disable-next-line: missing-fields
 shared.Spotter = {}
 function shared.Spotter.Init()
 --	if not Heimdall_Data.config.spotter.enabled then