diff --git a/src/de/steamwar/bungeecore/sql/Elo.java b/src/de/steamwar/bungeecore/sql/Elo.java
deleted file mode 100644
index da1db90..0000000
--- a/src/de/steamwar/bungeecore/sql/Elo.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  SteamWar.de-Serverteam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-package de.steamwar.bungeecore.sql;
-
-public class Elo {
-
-    private static final Statement elo = new Statement("SELECT Elo FROM Elo WHERE UserID = ? AND GameMode = ? AND Season = ?");
-    private static final Statement place = new Statement("SELECT COUNT(*) AS Place FROM Elo WHERE GameMode = ? AND Elo > ? AND Season = ?");
-
-    private Elo(){}
-
-    public static int getElo(int userID, String gameMode){
-        return getElo(Season.getSeason(), userID, gameMode);
-    }
-
-    public static int getElo(int season, int userID, String gameMode){
-        return elo.select(rs -> {
-            if(rs.next())
-                return rs.getInt("Elo");
-            return 1000;
-        }, userID, gameMode, season);
-    }
-
-    public static int getPlacement(int elo, String gameMode){
-        return getPlacement(Season.getSeason(), elo, gameMode);
-    }
-
-    public static int getPlacement(int season, int elo, String gameMode){
-        return place.select(rs -> {
-            if(rs.next())
-                return rs.getInt("Place");
-            return -1;
-        }, gameMode, elo, season);
-    }
-}
diff --git a/src/de/steamwar/bungeecore/sql/SchemElo.java b/src/de/steamwar/bungeecore/sql/SchemElo.java
new file mode 100644
index 0000000..d5253cf
--- /dev/null
+++ b/src/de/steamwar/bungeecore/sql/SchemElo.java
@@ -0,0 +1,48 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bungeecore.sql;
+
+public class SchemElo {
+    private SchemElo() {}
+
+    private static final Statement elo = new Statement("SELECT SchemElo FROM Elo WHERE SchemID = ? AND Season = ?");
+    private static final Statement setElo = new Statement("UPDATE SchemElo SET Elo = ? WHERE Season = ? AND SchemID = ?");
+    // private static final Statement place = new Statement("SELECT COUNT(*) AS Place FROM SchemElo WHERE Elo > ? AND Season = ?");
+
+    public static int getElo(int schemID) {
+        return getElo(Season.getSeason(), schemID);
+    }
+
+    public static int getElo(int season, int schemID) {
+        return elo.select(rs -> {
+            if (rs.next())
+                return rs.getInt("Elo");
+            return 1000;
+        }, schemID, season);
+    }
+
+    public static void setElo(int schemID, int elo) {
+        setElo(Season.getSeason(), schemID, elo);
+    }
+
+    public static void setElo(int season, int schemID, int elo) {
+        setElo.update(elo, season, schemID);
+    }
+}
diff --git a/src/de/steamwar/bungeecore/sql/UserElo.java b/src/de/steamwar/bungeecore/sql/UserElo.java
new file mode 100644
index 0000000..1d45f44
--- /dev/null
+++ b/src/de/steamwar/bungeecore/sql/UserElo.java
@@ -0,0 +1,61 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bungeecore.sql;
+
+public class UserElo {
+    private UserElo() {
+    }
+
+    private static final Statement elo = new Statement("SELECT UserElo FROM Elo WHERE UserID = ? AND GameMode = ? AND Season = ?");
+    private static final Statement setElo = new Statement("UPDATE UserELo SET Elo = ? WHERE Season = ? AND UserID = ? AND GameMode = ?");
+    private static final Statement place = new Statement("SELECT COUNT(*) AS Place FROM UserElo WHERE GameMode = ? AND Elo > ? AND Season = ?");
+
+    public static int getElo(int userID, String gameMode) {
+        return getElo(Season.getSeason(), userID, gameMode);
+    }
+
+    public static int getElo(int season, int userID, String gameMode) {
+        return elo.select(rs -> {
+            if (rs.next())
+                return rs.getInt("Elo");
+            return 1000;
+        }, userID, gameMode, season);
+    }
+
+    public static void setElo(int userId, String gameMode, int elo) {
+        setElo(Season.getSeason(), userId, gameMode, elo);
+    }
+
+    public static void setElo(int season, int userId, String gameMode, int elo) {
+        setElo.update(elo, season, userId, gameMode);
+    }
+
+    public static int getPlacement(int elo, String gameMode) {
+        return getPlacement(Season.getSeason(), elo, gameMode);
+    }
+
+    public static int getPlacement(int season, int elo, String gameMode) {
+        return place.select(rs -> {
+            if (rs.next())
+                return rs.getInt("Place");
+            return -1;
+        }, gameMode, elo, season);
+    }
+}