diff --git a/module/Apps/StatSidebar.mjs b/module/Apps/StatSidebar.mjs
index de61e02..af87f61 100644
--- a/module/Apps/StatSidebar.mjs
+++ b/module/Apps/StatSidebar.mjs
@@ -1,6 +1,4 @@
 import { filePath } from "../consts.mjs";
-import { StatsViewer } from "./StatsViewer.mjs";
-import { TableCreator } from "./TableCreator.mjs";
 
 const { HandlebarsApplicationMixin } = foundry.applications.api;
 const { AbstractSidebarTab } = foundry.applications.sidebar;
@@ -34,7 +32,7 @@ export class StatSidebar extends HandlebarsApplicationMixin(AbstractSidebarTab)
 
 	async _prepareContext(options) {
 		const ctx = await super._prepareContext(options);
-		const db = CONFIG.StatsDatabase;
+		const db = CONFIG.stats.db;
 
 		ctx.tableCount = db.getTables().length;
 
@@ -63,13 +61,13 @@ export class StatSidebar extends HandlebarsApplicationMixin(AbstractSidebarTab)
 
 	/** @this {StatSidebar} */
 	static async #openStats() {
-		const app = new StatsViewer();
+		const app = new CONFIG.stats.viewer;
 		app.render({ force: true });
 	};
 
 	/** @this {StatSidebar} */
 	static async #createTable() {
-		const app = new TableCreator;
+		const app = new CONFIG.stats.creator;
 		app.render({ force: true });
 	};
 };
diff --git a/module/Apps/StatsViewer.mjs b/module/Apps/StatsViewer.mjs
index 9855acc..03ae858 100644
--- a/module/Apps/StatsViewer.mjs
+++ b/module/Apps/StatsViewer.mjs
@@ -72,7 +72,7 @@ export class StatsViewer extends HandlebarsApplicationMixin(ApplicationV2) {
 
 	async _onFirstRender(context, options) {
 		await super._onFirstRender(context, options);
-		CONFIG.StatsDatabase.addApp(this);
+		CONFIG.stats.db.addApp(this);
 	};
 
 	async _onRender(context, options) {
@@ -123,7 +123,7 @@ export class StatsViewer extends HandlebarsApplicationMixin(ApplicationV2) {
 		const tables = new Set();
 		const subtables = {};
 
-		for (const tableConfig of CONFIG.StatsDatabase.getTables()) {
+		for (const tableConfig of CONFIG.stats.db.getTables()) {
 			const [ table, subtable ] = tableConfig.name.split(`/`);
 			tables.add(table);
 			if (subtable?.length > 0) {
@@ -182,8 +182,8 @@ export class StatsViewer extends HandlebarsApplicationMixin(ApplicationV2) {
 	_graphData = {};
 	_privacySetting = `my`;
 	async #prepareGraphContext(_ctx) {
-		const table = CONFIG.StatsDatabase.getTable(this.activeTableID);
-		const userData = CONFIG.StatsDatabase.getRows(
+		const table = CONFIG.stats.db.getTable(this.activeTableID);
+		const userData = CONFIG.stats.db.getRows(
 			this.activeTableID,
 			this._selectedUsers,
 			this._privacySetting,
diff --git a/module/Apps/TableCreator.mjs b/module/Apps/TableCreator.mjs
index 34271d7..02badb2 100644
--- a/module/Apps/TableCreator.mjs
+++ b/module/Apps/TableCreator.mjs
@@ -112,7 +112,7 @@ export class TableCreator extends HandlebarsApplicationMixin(ApplicationV2) {
 			ui.notifications.error(`Cannot create a table without a name`);
 		};
 
-		const existing = CONFIG.StatsDatabase.getTable(name);
+		const existing = CONFIG.stats.db.getTable(name);
 		if (existing) {
 			ui.notifications.error(`A table with the name "${name}" already exists`);
 		};
@@ -123,7 +123,7 @@ export class TableCreator extends HandlebarsApplicationMixin(ApplicationV2) {
 				return;
 			};
 			const size = Number(name.replace(`Dice/d`, ``));
-			CONFIG.StatsDatabase.createTable(createDiceTable(size));
+			CONFIG.stats.db.createTable(createDiceTable(size));
 			return;
 		};
 	};
diff --git a/module/hooks/init.mjs b/module/hooks/init.mjs
index 394d8f3..26cc172 100644
--- a/module/hooks/init.mjs
+++ b/module/hooks/init.mjs
@@ -4,6 +4,8 @@ import { MemoryDatabase } from "../utils/databases/Memory.mjs";
 import { registerCustomComponents } from "../Apps/elements/_index.mjs";
 import { registerMetaSettings } from "../settings/meta.mjs";
 import { StatSidebar } from "../Apps/StatSidebar.mjs";
+import { StatsViewer } from "../Apps/StatsViewer.mjs";
+import { TableCreator } from "../Apps/TableCreator.mjs";
 import { UserFlagDatabase } from "../utils/databases/UserFlag.mjs";
 
 Hooks.on(`init`, () => {
@@ -22,13 +24,16 @@ Hooks.on(`init`, () => {
 	delete CONFIG.ui.sidebar.TABS.settings;
 	CONFIG.ui.sidebar.TABS.settings = temp;
 
-
 	registerMetaSettings();
 
-	if (import.meta.env.PROD) {
-		CONFIG.StatsDatabase = UserFlagDatabase;
-	} else {
-		CONFIG.StatsDatabase = MemoryDatabase;
+	CONFIG.stats = {
+		db: UserFlagDatabase,
+		viewer: StatsViewer,
+		creator: TableCreator,
+	};
+
+	if (import.meta.env.DEV) {
+		CONFIG.stats.db = MemoryDatabase;
 	}
 
 	Handlebars.registerHelper(helpers);