diff --git a/Modules/AgentTracker.lua b/Modules/AgentTracker.lua
index 677ff82..6c1e8fe 100644
--- a/Modules/AgentTracker.lua
+++ b/Modules/AgentTracker.lua
@@ -10,8 +10,6 @@ local ModuleName = "AgentTracker"
 ---@field debug boolean
 ---@field channels string[]
 
-shared.agentTracker.agents = ReactiveValue(Heimdall_Data.config.agents)
-
 ---@class AgentTracker
 shared.AgentTracker = {
 	---@param name string
@@ -46,6 +44,10 @@ shared.AgentTracker = {
 	end,
 	---@return nil
 	Init = function()
+		shared.agentTracker = {
+			agents = ReactiveValue.new(Heimdall_Data.config.agents),
+		}
+
 		--/run Heimdall_Data.config.agents["Cyheuraeth"]=date("%Y-%m-%dT%H:%M:%S")
 		---@type table<string, boolean>
 		local channelRosterFrame = CreateFrame("Frame")
diff --git a/Modules/NetworkMessenger.lua b/Modules/NetworkMessenger.lua
index 7f07608..2385c1e 100644
--- a/Modules/NetworkMessenger.lua
+++ b/Modules/NetworkMessenger.lua
@@ -7,6 +7,10 @@ local ModuleName = "NetworkMessenger"
 ---@field debug boolean
 ---@field interval number
 
+---@class HeimdallNetworkMessengerData
+---@field queue table<string, Message>
+---@field ticker Timer?
+
 ---@class NetworkMessenger
 shared.NetworkMessenger = {
 	Init = function()
diff --git a/Modules/StinkyCache.lua b/Modules/StinkyCache.lua
index a8db8bd..9636177 100644
--- a/Modules/StinkyCache.lua
+++ b/Modules/StinkyCache.lua
@@ -8,6 +8,9 @@ local ModuleName = "StinkyCache"
 ---@field commander string
 ---@field ttl number
 
+---@class HeimdallStinkyCacheData
+---@field stinkies table<string, {value: number, timestamp: number}>
+
 ---@class StinkyCache
 shared.StinkyCache = {
 	Init = function()
diff --git a/Modules/Whoer.lua b/Modules/Whoer.lua
index 9a9d321..686e944 100644
--- a/Modules/Whoer.lua
+++ b/Modules/Whoer.lua
@@ -12,6 +12,10 @@ local ModuleName = "Whoer"
 ---@field zoneNotifyFor table<string, boolean>
 ---@field queries string
 
+---@class HeimdallWhoData
+---@field updateTicker Timer?
+---@field whoTicker Timer?
+
 ---@class Whoer
 shared.Whoer = {
 	Init = function()