diff --git a/src/Client.ts b/src/Client.ts
index d75f336..b15df2e 100644
--- a/src/Client.ts
+++ b/src/Client.ts
@@ -1,7 +1,9 @@
 import Discord, { Client, Collection } from "discord.js";
 import Datastore from "./client/classes/Datastore.js";
 import Radio from "./client/classes/Radio.js";
+import Stations from "./client/classes/Stations.js";
 import Streamer from "./client/classes/Streamer.js";
+import Statistics from "./client/classes/Statistics.js";
 import fs from "fs";
 import { command, radio } from "./client/utils/typings.js";
 import config from "./config.js";
@@ -19,35 +21,34 @@ GatewayIntents.add(
 
 class RadioClient extends Client {
     readonly commands: Collection<string, command>;
-    readonly radio: Map<string, radio>;
     public funcs: any;
     readonly config = config;
     readonly messages = messages;
     public datastore: Datastore | null;
+    public stations: Stations | null;
     public streamer: Streamer | null;
+    public statistics: Statistics | null;
+    public radio: Radio | null;
     constructor() {
         super({
             intents: GatewayIntents
         });
         this.commands = new Collection();
-        this.radio = new Map();
         this.datastore = null;
+        this.stations = null;
         this.streamer = null;
+        this.statistics = null;
+        this.radio = null;
 
         this.funcs = {};
         this.funcs.check = require("./client/funcs/check.js");
-        this.funcs.checkFetchStatus = require("./client/funcs/checkFetchStatus.js");
         this.funcs.isDev = require("./client/funcs/isDev.js");
         this.funcs.logger = require("./client/funcs/logger.js");
         this.funcs.msToTime = require("./client/funcs/msToTime.js");
-        this.funcs.statisticsUpdate = require("./client/funcs/statisticsUpdate.js");
         this.funcs.saveState = require("./client/funcs/saveState.js");
         this.funcs.loadState = require("./client/funcs/loadState.js");
-        this.funcs.searchStation = require("./client/funcs/searchStation.js");
         this.funcs.play = require("./client/funcs/play.js");
         this.funcs.listStations = require("./client/funcs/listStations.js");
-        this.funcs.restoreRadios = require("./client/funcs/restoreRadios.js");
-        this.funcs.saveRadios = require("./client/funcs/saveRadios.js");
 
         console.log('RadioX ' + this.config.version);
         console.log('Internet Radio to your Discord guild');