diff --git a/RSND/Core/Database.cs b/RSND/Core/Database.cs
index fefcd27..ef09e36 100644
--- a/RSND/Core/Database.cs
+++ b/RSND/Core/Database.cs
@@ -83,14 +83,14 @@ public class Database
         var table = query?.TableName;
         var key = query?.Key;
         var value = query?.Value;
-        var newValue = query?.NewValue;
+        var keySet = query?.KeySet;
+        var valueSet = query?.ValueSet;
         
         var tableToReturn = _tables.Find(x => x.Name == table);
         var row = tableToReturn?.Rows?.FirstOrDefault(x => x.Columns?.FirstOrDefault(y => y.Name == key)?.Value == value);
-        var column = row?.Columns?.FirstOrDefault(x => x.Name == key);
-        
+        var column = row?.Columns?.Find(x => x.Name == keySet);
         if (column != null)
-            column.Value = newValue;
+            column.Value = valueSet;
         
         Save();
     }
diff --git a/RSND/Core/Querying/Queries/SetQuery.cs b/RSND/Core/Querying/Queries/SetQuery.cs
index dad3b92..66c8214 100644
--- a/RSND/Core/Querying/Queries/SetQuery.cs
+++ b/RSND/Core/Querying/Queries/SetQuery.cs
@@ -5,5 +5,7 @@ public class SetQuery : Query
     public string TableName { get; set; }
     public string Key { get; set; }
     public string Value { get; set; }
+    public string KeySet { get; set; }
+    public string ValueSet { get; set; }
     public string NewValue { get; set; }
 }
\ No newline at end of file
diff --git a/RSND/RsndMain.cs b/RSND/RsndMain.cs
index a53534b..eabbcea 100644
--- a/RSND/RsndMain.cs
+++ b/RSND/RsndMain.cs
@@ -12,22 +12,7 @@ public static class RsndMain
     {
         Db.SetupFiles();
         Db.Save();
-        
-        Db.CreateTable(new Table
-        {
-            Name = "fooTable",
-            Rows = new List<Row>
-            {
-                new()
-                {
-                    Columns = new List<Column>
-                    {
-                        new("test", "1")
-                    }
-                }
-            }
-        });
-        
+
         WebSocketServer server = new WebSocketServer("ws://0.0.0.0:7878");
         Console.WriteLine("Server started");
         FleckLog.Level = LogLevel.Error;