diff --git a/src/client/commands/list.js b/src/client/commands/list.js
index 00d73b9..70ba290 100644
--- a/src/client/commands/list.js
+++ b/src/client/commands/list.js
@@ -7,7 +7,7 @@ module.exports = {
     execute(interaction, client) {
         let message = {};
 
-        if(!client.stations.list) {
+        if(!client.stations) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
             return interaction.reply({
                 content: client.messageEmojis["error"] + message.errorToGetPlaylist,
@@ -20,7 +20,7 @@ module.exports = {
         if(radio && !client.config.maintenanceMode){
             client.funcs.listStations(client, interaction);
         } else {
-            let stations = `${client.stations.list.map(s => `**#** ${s.name}`).join('\n')}`
+            let stations = `${client.stations.map(s => `**#** ${s.name}`).join('\n')}`
             const hashs = stations.split('**#**').length;
             for (let i = 0; i < hashs; i++) {
                 stations = stations.replace('**#**', `**${i + 1}.**`);
diff --git a/src/client/commands/next.js b/src/client/commands/next.js
index 3f0114f..0712d74 100644
--- a/src/client/commands/next.js
+++ b/src/client/commands/next.js
@@ -6,10 +6,10 @@ module.exports = {
         if (client.funcs.check(client, interaction, command)) {
             const radio = client.radio.get(interaction.guild.id);
 
-            let index = client.stations.list.findIndex(station => station.name == radio.station.name) + 1;
-            if(index == client.stations.list.length) index = 0;
+            let index = client.stations.findIndex(station => station.name == radio.station.name) + 1;
+            if(index == client.stations.length) index = 0;
 
-            let station = client.stations.list[index];
+            let station = client.stations[index];
 
             if(!station) return interaction.reply({
                 content: client.messageEmojis["error"] + client.messages.noSearchResults,
diff --git a/src/client/commands/play.js b/src/client/commands/play.js
index 62b65a8..057aeaa 100644
--- a/src/client/commands/play.js
+++ b/src/client/commands/play.js
@@ -71,13 +71,13 @@ module.exports = {
                 ephemeral: true
             });
         } else if (!isNaN(number)) {
-            if (number > client.stations.list.length - 1) {
+            if (number > client.stations.length - 1) {
                 return interaction.reply({
                     content: client.messageEmojis["error"] + client.messages.wrongStationNumber,
                     ephemeral: true
                 });
             } else {
-                station = client.stations.list[number];
+                station = client.stations[number];
             }
         } else {
             if (query.length < 3) return interaction.reply({
diff --git a/src/client/commands/prev.js b/src/client/commands/prev.js
index 6189919..75a79d0 100644
--- a/src/client/commands/prev.js
+++ b/src/client/commands/prev.js
@@ -6,10 +6,10 @@ module.exports = {
         if (client.funcs.check(client, interaction, command)) {
             const radio = client.radio.get(interaction.guild.id);
 
-            let index = client.stations.list.findIndex(station => station.name == radio.station.name) - 1;
-            if(index == -1) index = client.stations.list.length - 1;
+            let index = client.stations.findIndex(station => station.name == radio.station.name) - 1;
+            if(index == -1) index = client.stations.length - 1;
 
-            let station = client.stations.list[index];
+            let station = client.stations[index];
 
             if(!station) return interaction.reply({
                 content: client.messageEmojis["error"] + client.messages.noSearchResults,
diff --git a/src/client/commands/statistics.js b/src/client/commands/statistics.js
index 6c3f42b..56c533c 100644
--- a/src/client/commands/statistics.js
+++ b/src/client/commands/statistics.js
@@ -7,12 +7,12 @@ module.exports = {
     category: 'info',
     execute(interaction, client) {
         let message = {};
-        let stations = client.stations.list;
+        let stations = client.stations;
         let currentGuild = client.datastore.getEntry(interaction.guild.id);
         let global = client.datastore.getEntry("global");
         let statistics = "";
 
-        if(!client.stations.list) {
+        if(!client.stations) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
             return interaction.reply({
                 content: client.messageEmojis["error"] + message.errorToGetPlaylist,