diff --git a/lib/aethyr/core/commands/admin/acarea.rb b/lib/aethyr/core/commands/admin/acarea.rb
index 89ed1ffca11410ed2927996b3e917d2bf225b84f..24ccc2d1ae7e70c3ac9a84c8ab8be8d849b11c89 100644
--- a/lib/aethyr/core/commands/admin/acarea.rb
+++ b/lib/aethyr/core/commands/admin/acarea.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/acdoor.rb b/lib/aethyr/core/commands/admin/acdoor.rb
index f42d50b5f5a10fb25fe0bb3f9a052e66d841132e..99539248b3055c274a520c5a2adef65d7d94e01a 100644
--- a/lib/aethyr/core/commands/admin/acdoor.rb
+++ b/lib/aethyr/core/commands/admin/acdoor.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/acexit.rb b/lib/aethyr/core/commands/admin/acexit.rb
index f550945815a70dee46f34da7424116db869ec48a..c8075dd3190396f4fd37720f52469b546b46f5c9 100644
--- a/lib/aethyr/core/commands/admin/acexit.rb
+++ b/lib/aethyr/core/commands/admin/acexit.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/acomm.rb b/lib/aethyr/core/commands/admin/acomm.rb
index 5dec941bc90e258c00de5adaa09c4dce048bac64..09eb87de7f22fd3142595548ed08f4dda8f21d43 100644
--- a/lib/aethyr/core/commands/admin/acomm.rb
+++ b/lib/aethyr/core/commands/admin/acomm.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/acomment.rb b/lib/aethyr/core/commands/admin/acomment.rb
index 7b6223ab66d6c82df4e441d5552b04aabd52884b..fbed91bda4df99d5464f3ce7aa60c784bd4276e8 100644
--- a/lib/aethyr/core/commands/admin/acomment.rb
+++ b/lib/aethyr/core/commands/admin/acomment.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/aconfig.rb b/lib/aethyr/core/commands/admin/aconfig.rb
index ee090b3c91ede07812f22d48bbf9f34e85a79106..8b40f51188066bf27e59de91dfa4805882cd7c51 100644
--- a/lib/aethyr/core/commands/admin/aconfig.rb
+++ b/lib/aethyr/core/commands/admin/aconfig.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/acportal.rb b/lib/aethyr/core/commands/admin/acportal.rb
index 970179d238ee2c839635fed79848b9bd7bee612d..b7c3edd8e483513cb2d6b4fab35e3da89d5d56e5 100644
--- a/lib/aethyr/core/commands/admin/acportal.rb
+++ b/lib/aethyr/core/commands/admin/acportal.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/acprop.rb b/lib/aethyr/core/commands/admin/acprop.rb
index 4dafccfb569c16d1b9da349cc144137288691f61..da94b07a6115f12a42f70a68f7b908d796724ee6 100644
--- a/lib/aethyr/core/commands/admin/acprop.rb
+++ b/lib/aethyr/core/commands/admin/acprop.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/acreate.rb b/lib/aethyr/core/commands/admin/acreate.rb
index e99197e61c5d50ee686ff11177ac4a244ed38055..55c96b6c3e23ce849736c5ef53f07dbaa300f48b 100644
--- a/lib/aethyr/core/commands/admin/acreate.rb
+++ b/lib/aethyr/core/commands/admin/acreate.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/acroom.rb b/lib/aethyr/core/commands/admin/acroom.rb
index b329c27efe870cc2afde3fd4848489293b7e8b71..9f93812b713c8aaa9215ae5e7ff0dcd68971f0f3 100644
--- a/lib/aethyr/core/commands/admin/acroom.rb
+++ b/lib/aethyr/core/commands/admin/acroom.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/adelete.rb b/lib/aethyr/core/commands/admin/adelete.rb
index a3a914b17c8272e559017fe3f594d461cefe7286..e94ddd959d870874f791c34fae2706672eea5532 100644
--- a/lib/aethyr/core/commands/admin/adelete.rb
+++ b/lib/aethyr/core/commands/admin/adelete.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/adesc.rb b/lib/aethyr/core/commands/admin/adesc.rb
index 3e205c2ffc301a51637a27e64bda398c6c1a26fb..18d08997f6b4aaf23ec44b97446e5e403bbdaf93 100644
--- a/lib/aethyr/core/commands/admin/adesc.rb
+++ b/lib/aethyr/core/commands/admin/adesc.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/aforce.rb b/lib/aethyr/core/commands/admin/aforce.rb
index ee6ca47de8d046ed4d43e4a6830e04d4c4d23155..13d8e2cda2bc1334f1df93e7b96e2f7c6fefef17 100644
--- a/lib/aethyr/core/commands/admin/aforce.rb
+++ b/lib/aethyr/core/commands/admin/aforce.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/ahelp.rb b/lib/aethyr/core/commands/admin/ahelp.rb
index 506c1cb5e8842871ebc4e052b39c337bc5daf147..1d58b04e717ddcb1de6e4cc80bab720dc5203397 100644
--- a/lib/aethyr/core/commands/admin/ahelp.rb
+++ b/lib/aethyr/core/commands/admin/ahelp.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/ahide.rb b/lib/aethyr/core/commands/admin/ahide.rb
index 6806659a4b388afc53a2ee9990f8b9b5ea2d8ed1..b03383752eee3c6151dda98dfe658ab166120772 100644
--- a/lib/aethyr/core/commands/admin/ahide.rb
+++ b/lib/aethyr/core/commands/admin/ahide.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/ainfo.rb b/lib/aethyr/core/commands/admin/ainfo.rb
index 560c7a77ee5df90b597d043fe5105265eda0027c..88b7c9f96d3a6ed3db906fd8e9c06d668f6dba8e 100644
--- a/lib/aethyr/core/commands/admin/ainfo.rb
+++ b/lib/aethyr/core/commands/admin/ainfo.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/alearn.rb b/lib/aethyr/core/commands/admin/alearn.rb
index 6399d09dcb707c55222aa3eeef9fbfd37ac23885..dcf633c8c1a81f50eae5205d4a67b5249d505e31 100644
--- a/lib/aethyr/core/commands/admin/alearn.rb
+++ b/lib/aethyr/core/commands/admin/alearn.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/alist.rb b/lib/aethyr/core/commands/admin/alist.rb
index 3c09feecfe43c8c1112356726443e77e61dc1703..8424c99d74c770c24710bf53a3911d4cdbe60a86 100644
--- a/lib/aethyr/core/commands/admin/alist.rb
+++ b/lib/aethyr/core/commands/admin/alist.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/alog.rb b/lib/aethyr/core/commands/admin/alog.rb
index 80dea62030572c20f628a4499ed0b190d07e6b35..235e7d11674d7207af101f56c2bc7f1abe7a73d2 100644
--- a/lib/aethyr/core/commands/admin/alog.rb
+++ b/lib/aethyr/core/commands/admin/alog.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/alook.rb b/lib/aethyr/core/commands/admin/alook.rb
index fc27ae15c2507fa86f3b114f15ab46cc6117ed02..87fdbd270b9898b1513a1d4ea5caefe8ee797493 100644
--- a/lib/aethyr/core/commands/admin/alook.rb
+++ b/lib/aethyr/core/commands/admin/alook.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/aput.rb b/lib/aethyr/core/commands/admin/aput.rb
index 6e804b913b9faabd089e09fb0eeb12e755e2f734..3b02d70f523a0aec4f331e7977bc12af2922febd 100644
--- a/lib/aethyr/core/commands/admin/aput.rb
+++ b/lib/aethyr/core/commands/admin/aput.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/areact.rb b/lib/aethyr/core/commands/admin/areact.rb
index b76c788e26961ed3778e3428fe359c9829c56233..65f8cecf5caeaf4538f5dc309cbefa92240ac967 100644
--- a/lib/aethyr/core/commands/admin/areact.rb
+++ b/lib/aethyr/core/commands/admin/areact.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/areas.rb b/lib/aethyr/core/commands/admin/areas.rb
index 59fe9c934b32ec63b34d8fc7d9f7a653ffd1a2f4..71b69c04e0069119963a990bb3e17fd109fac96c 100644
--- a/lib/aethyr/core/commands/admin/areas.rb
+++ b/lib/aethyr/core/commands/admin/areas.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/areload.rb b/lib/aethyr/core/commands/admin/areload.rb
index 4f2ce25a5876b470af6a901e4c1b0e3c033e956c..1837bf4f6eb24829748b1d72dc6afe1f1a94d4f3 100644
--- a/lib/aethyr/core/commands/admin/areload.rb
+++ b/lib/aethyr/core/commands/admin/areload.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/asave.rb b/lib/aethyr/core/commands/admin/asave.rb
index 2aecde918c07980d8a2a002e4eecda09ac4fc40d..1c8c4753207de5576275420a37bc88f47b64d773 100644
--- a/lib/aethyr/core/commands/admin/asave.rb
+++ b/lib/aethyr/core/commands/admin/asave.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/aset.rb b/lib/aethyr/core/commands/admin/aset.rb
index cb23e15318956062f8b69a2eb90916aa40e8f715..1ad79e0c4d72b9134e0dcbf87d40109e42ef1c32 100644
--- a/lib/aethyr/core/commands/admin/aset.rb
+++ b/lib/aethyr/core/commands/admin/aset.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/ashow.rb b/lib/aethyr/core/commands/admin/ashow.rb
index 514d930030e2152d3adf03b8ed2f9703d6bd7ade..3191f8156017e96e38cc16a44959e25a5acd8aec 100644
--- a/lib/aethyr/core/commands/admin/ashow.rb
+++ b/lib/aethyr/core/commands/admin/ashow.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/astatus.rb b/lib/aethyr/core/commands/admin/astatus.rb
index 9533d092ab746363b1fb0d2a29dd72e43915f54f..39307d542e746f0ce2f2322dc3f4fa799eee592f 100644
--- a/lib/aethyr/core/commands/admin/astatus.rb
+++ b/lib/aethyr/core/commands/admin/astatus.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/ateach.rb b/lib/aethyr/core/commands/admin/ateach.rb
index b09c621ab43a9b5a40d5fc6fe0b501deaaf46fa4..d2e21d1ce04a58369b5fe0ae9e2642c29afc39ae 100644
--- a/lib/aethyr/core/commands/admin/ateach.rb
+++ b/lib/aethyr/core/commands/admin/ateach.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/awatch.rb b/lib/aethyr/core/commands/admin/awatch.rb
index 6ae429bf1e684cebec045483c31cdd9bf40fe1ee..b014ca6e747ba138fe63728ee5d669e5a296bb61 100644
--- a/lib/aethyr/core/commands/admin/awatch.rb
+++ b/lib/aethyr/core/commands/admin/awatch.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/awho.rb b/lib/aethyr/core/commands/admin/awho.rb
index 2241a30644d4f969d23b4c8e622a6e4672bb50ef..7a68b50e4fe88ac2f8a8d94fe4ce80025b9a0df0 100644
--- a/lib/aethyr/core/commands/admin/awho.rb
+++ b/lib/aethyr/core/commands/admin/awho.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/deleteplayer.rb b/lib/aethyr/core/commands/admin/deleteplayer.rb
index 6a3f377958e4edfedea4a4d50f4096783db39d49..c81cffbbe9afb568c750ff7f9e2fe46693801a6e 100644
--- a/lib/aethyr/core/commands/admin/deleteplayer.rb
+++ b/lib/aethyr/core/commands/admin/deleteplayer.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/restart.rb b/lib/aethyr/core/commands/admin/restart.rb
index db774142c46f5e6f19ef3995a1bdc23cf766e59a..b66336de36ec0b6abc41bddb95ceca80e0f288da 100644
--- a/lib/aethyr/core/commands/admin/restart.rb
+++ b/lib/aethyr/core/commands/admin/restart.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/admin/terrain.rb b/lib/aethyr/core/commands/admin/terrain.rb
index 077b1e6f67c1d1c565d4903bea8374ac1b1da01e..1c2429cf13c622e2ea4ecf42b64fd5e6ac615555 100644
--- a/lib/aethyr/core/commands/admin/terrain.rb
+++ b/lib/aethyr/core/commands/admin/terrain.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/block.rb b/lib/aethyr/core/commands/block.rb
index 270952a386b2dce74a30e1118e2454ef1ff70521..7a7aa7c00ed2a5948d6d541c069e0197e4d5fbda 100644
--- a/lib/aethyr/core/commands/block.rb
+++ b/lib/aethyr/core/commands/block.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/close.rb b/lib/aethyr/core/commands/close.rb
index 39fc2d51a9703bc8e565705a0ac5ee148ae44d24..d61e59fa9e42669a406d385d36ca76d6d5cc8c4b 100644
--- a/lib/aethyr/core/commands/close.rb
+++ b/lib/aethyr/core/commands/close.rb
@@ -15,7 +15,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/dodge.rb b/lib/aethyr/core/commands/dodge.rb
index 5edf0917db6ae215c06cfc3dda9c3d6363e6565b..fc6d4fdb241adb0745979f084b51fa82c0cfeb9b 100644
--- a/lib/aethyr/core/commands/dodge.rb
+++ b/lib/aethyr/core/commands/dodge.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/drop.rb b/lib/aethyr/core/commands/drop.rb
index bf333f2ee8ae6a482c54c7c776beb7157dd750b2..dec978798026f357fbe531c9c0c693411b3f24c3 100644
--- a/lib/aethyr/core/commands/drop.rb
+++ b/lib/aethyr/core/commands/drop.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
           
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/agree.rb b/lib/aethyr/core/commands/emotes/agree.rb
index fa8e8fd3ff3ce409eed22f6ba41d4ea7df16ab9a..c672fc1b82ddca6713480b2d8fcc611db5ccfc75 100644
--- a/lib/aethyr/core/commands/emotes/agree.rb
+++ b/lib/aethyr/core/commands/emotes/agree.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/back.rb b/lib/aethyr/core/commands/emotes/back.rb
index ecd52fcaee5c5e7da7ca656f4ad0c67949097dda..da0034701c955d7c42e25a5706fbbccf263ecd6e 100644
--- a/lib/aethyr/core/commands/emotes/back.rb
+++ b/lib/aethyr/core/commands/emotes/back.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/blush.rb b/lib/aethyr/core/commands/emotes/blush.rb
index ca3a5c09d69b26aea88f939bdfdb93ffdfbe3c59..36760c9a05cbb7cbe0bb2b662c539fc4c76e693a 100644
--- a/lib/aethyr/core/commands/emotes/blush.rb
+++ b/lib/aethyr/core/commands/emotes/blush.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/bow.rb b/lib/aethyr/core/commands/emotes/bow.rb
index 39d123275eda704dd535acd3cdfe8133adbcc464..f2a7a24c90fe75bffcb4adea29c411e3737ce7a6 100644
--- a/lib/aethyr/core/commands/emotes/bow.rb
+++ b/lib/aethyr/core/commands/emotes/bow.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/brb.rb b/lib/aethyr/core/commands/emotes/brb.rb
index d8d6dce968a2952e84f939d13e1204adb20c7d51..48ea3d25059f83612979977a3105d9bad4f37fbb 100644
--- a/lib/aethyr/core/commands/emotes/brb.rb
+++ b/lib/aethyr/core/commands/emotes/brb.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/bye.rb b/lib/aethyr/core/commands/emotes/bye.rb
index a8dcae9f9c916d20be0d2018dcceaa5a2ce31f02..18ffeaad303dc506770b16212bc08c49b4ae996c 100644
--- a/lib/aethyr/core/commands/emotes/bye.rb
+++ b/lib/aethyr/core/commands/emotes/bye.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/cheer.rb b/lib/aethyr/core/commands/emotes/cheer.rb
index 8ecd1e508e85bd657a0afd0930ba1c831c87a12f..94370d5cecafcfbd8d39943ffd0d8c1796705888 100644
--- a/lib/aethyr/core/commands/emotes/cheer.rb
+++ b/lib/aethyr/core/commands/emotes/cheer.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/cry.rb b/lib/aethyr/core/commands/emotes/cry.rb
index 15f1eeff1260d7c35194d149087be40d90c76a56..5ad2e1eee511e691c269d54477963dfd1e66f668 100644
--- a/lib/aethyr/core/commands/emotes/cry.rb
+++ b/lib/aethyr/core/commands/emotes/cry.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/curtsey.rb b/lib/aethyr/core/commands/emotes/curtsey.rb
index 2fda5152281f3d49bb3137ad5a56bc102a0c2c73..e87bb7797c482ead9265281c2325857ae2e8aca9 100644
--- a/lib/aethyr/core/commands/emotes/curtsey.rb
+++ b/lib/aethyr/core/commands/emotes/curtsey.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/eh.rb b/lib/aethyr/core/commands/emotes/eh.rb
index 2e1824991a076a381a9e8aa8e8bf2c1354dda395..77b04021e43fe9ba5e475446d06b376d6a0b5861 100644
--- a/lib/aethyr/core/commands/emotes/eh.rb
+++ b/lib/aethyr/core/commands/emotes/eh.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/emote.rb b/lib/aethyr/core/commands/emotes/emote.rb
index 3664b1bf293ae37b6809ed5cf4854f8d646d0caa..4ad7c3277b94857018898b616b2edc73eb906ef8 100644
--- a/lib/aethyr/core/commands/emotes/emote.rb
+++ b/lib/aethyr/core/commands/emotes/emote.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/er.rb b/lib/aethyr/core/commands/emotes/er.rb
index 768d0464f8fa5356b5187318b42929aff7ca94b1..ad1dc73dd70b86a0977f47b45bca430bcc5b9a2c 100644
--- a/lib/aethyr/core/commands/emotes/er.rb
+++ b/lib/aethyr/core/commands/emotes/er.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/ew.rb b/lib/aethyr/core/commands/emotes/ew.rb
index 58101b2b2cc9ea5026fc0960e053a97c15116d74..3b63eaccd201a58cf9c99d6cbdcf6a88ecd74d35 100644
--- a/lib/aethyr/core/commands/emotes/ew.rb
+++ b/lib/aethyr/core/commands/emotes/ew.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/frown.rb b/lib/aethyr/core/commands/emotes/frown.rb
index 76e8bc8c6af5f81a40642f198429a81cd560766f..e3e8d8afa1d246b0e1fb10f64f277941df84bade 100644
--- a/lib/aethyr/core/commands/emotes/frown.rb
+++ b/lib/aethyr/core/commands/emotes/frown.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/grin.rb b/lib/aethyr/core/commands/emotes/grin.rb
index 989dec3c5ed5cf0567ea4b9a45851b39a4a16167..9eaccea325efc8d20cdb3c38c52aa143376c8b27 100644
--- a/lib/aethyr/core/commands/emotes/grin.rb
+++ b/lib/aethyr/core/commands/emotes/grin.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/hi.rb b/lib/aethyr/core/commands/emotes/hi.rb
index f976dcd696d7328e58b9c9183669900f61ad734e..f3479fa68e7cc1a8916422b686012e78415c6485 100644
--- a/lib/aethyr/core/commands/emotes/hi.rb
+++ b/lib/aethyr/core/commands/emotes/hi.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/hm.rb b/lib/aethyr/core/commands/emotes/hm.rb
index 93a7e6b70d442d46d86341258503eff4c8aacfca..395038e1bb0caa917f363bc596d3a9eb0ab67291 100644
--- a/lib/aethyr/core/commands/emotes/hm.rb
+++ b/lib/aethyr/core/commands/emotes/hm.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/hug.rb b/lib/aethyr/core/commands/emotes/hug.rb
index aef490815b28f8fc289d83c12b34a7f2b9e7d5b5..f0944eb229416f9db2bf696cbce94fc541c7f19c 100644
--- a/lib/aethyr/core/commands/emotes/hug.rb
+++ b/lib/aethyr/core/commands/emotes/hug.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/huh.rb b/lib/aethyr/core/commands/emotes/huh.rb
index af05a4a64366628e08254b12c9b8ad1311c7ce59..07364922c52ef606eb7eea1c4ceccffd3a555e69 100644
--- a/lib/aethyr/core/commands/emotes/huh.rb
+++ b/lib/aethyr/core/commands/emotes/huh.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/laugh.rb b/lib/aethyr/core/commands/emotes/laugh.rb
index 15f674cfab075cd3dc24de46df2bb1ab6a05bbed..e0804c124faff33be436c9419af7c92ac0e12c37 100644
--- a/lib/aethyr/core/commands/emotes/laugh.rb
+++ b/lib/aethyr/core/commands/emotes/laugh.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/no.rb b/lib/aethyr/core/commands/emotes/no.rb
index 36acf8802ac939c893e4dc5f65d35171673380a7..0a4767d60226079876bbcb61e49635d79752292f 100644
--- a/lib/aethyr/core/commands/emotes/no.rb
+++ b/lib/aethyr/core/commands/emotes/no.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/nod.rb b/lib/aethyr/core/commands/emotes/nod.rb
index 231b30e504a8192ef125404bd347e5cb77691c9f..08dbb5c6fae2a1299d602baa9f8013efdb04ce08 100644
--- a/lib/aethyr/core/commands/emotes/nod.rb
+++ b/lib/aethyr/core/commands/emotes/nod.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/pet.rb b/lib/aethyr/core/commands/emotes/pet.rb
index ea72c0403dcaad99ea132011b1f5b0f1ab33697d..7d5407c665b1a53e4cc0e68be9e83296dfd6979a 100644
--- a/lib/aethyr/core/commands/emotes/pet.rb
+++ b/lib/aethyr/core/commands/emotes/pet.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/poke.rb b/lib/aethyr/core/commands/emotes/poke.rb
index 06cebdc0fe35d764d0002125d40524f66e05fe49..18558e34a51abe84d15e13f52147d813e287112c 100644
--- a/lib/aethyr/core/commands/emotes/poke.rb
+++ b/lib/aethyr/core/commands/emotes/poke.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/ponder.rb b/lib/aethyr/core/commands/emotes/ponder.rb
index 9e307c822abcb218fb9443cf328a92082a9a87b8..b5fbcad7527f647e136a4423730a7e4e3563cb65 100644
--- a/lib/aethyr/core/commands/emotes/ponder.rb
+++ b/lib/aethyr/core/commands/emotes/ponder.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/shrug.rb b/lib/aethyr/core/commands/emotes/shrug.rb
index f1cd0333b91411e3a95869d0c5c8b6bb7c754382..f348a64ee4d488380d408a29f71a440e6fef916a 100644
--- a/lib/aethyr/core/commands/emotes/shrug.rb
+++ b/lib/aethyr/core/commands/emotes/shrug.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/sigh.rb b/lib/aethyr/core/commands/emotes/sigh.rb
index 9ae6ead7bdc6460e2e92688b254ac2ade6ec23a7..d8485bfe4f22fa27a848b957caaeb167e8cb547b 100644
--- a/lib/aethyr/core/commands/emotes/sigh.rb
+++ b/lib/aethyr/core/commands/emotes/sigh.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/skip.rb b/lib/aethyr/core/commands/emotes/skip.rb
index 5931ab7771615c3590392ece9afe94f8edb612f3..105e1933aab7402ef835d12ce2af95b39431b509 100644
--- a/lib/aethyr/core/commands/emotes/skip.rb
+++ b/lib/aethyr/core/commands/emotes/skip.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/smile.rb b/lib/aethyr/core/commands/emotes/smile.rb
index f432a2906ee94a91929272df5bd724cfb90395e4..d2c88b9d3325273bba607e21d8a77d528636aa27 100644
--- a/lib/aethyr/core/commands/emotes/smile.rb
+++ b/lib/aethyr/core/commands/emotes/smile.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/snicker.rb b/lib/aethyr/core/commands/emotes/snicker.rb
index 182820e20d5094be7519643cad0aaa9fe002357c..55932f6a8ff62c904e4bb96b6070e72b5aa7b36b 100644
--- a/lib/aethyr/core/commands/emotes/snicker.rb
+++ b/lib/aethyr/core/commands/emotes/snicker.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/uh.rb b/lib/aethyr/core/commands/emotes/uh.rb
index d5540e3a48f07d5dc2be26ac646b239d93eded79..32f314c47bc6b145a8c937d857b4b5c43cb8f004 100644
--- a/lib/aethyr/core/commands/emotes/uh.rb
+++ b/lib/aethyr/core/commands/emotes/uh.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/wave.rb b/lib/aethyr/core/commands/emotes/wave.rb
index 6cd8b5b4af5bf233c1dc6d505da8b55d7d7b6c16..8a4c5b6195f6f6ac3ab6ad6391fbc29eb337144c 100644
--- a/lib/aethyr/core/commands/emotes/wave.rb
+++ b/lib/aethyr/core/commands/emotes/wave.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/yawn.rb b/lib/aethyr/core/commands/emotes/yawn.rb
index bd37ba56b3a862ed8b8e5b0e4a7d50f73405791c..c3dd414d6db27cb33a1b08964307a8757ae450fe 100644
--- a/lib/aethyr/core/commands/emotes/yawn.rb
+++ b/lib/aethyr/core/commands/emotes/yawn.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/emotes/yes.rb b/lib/aethyr/core/commands/emotes/yes.rb
index f6fa418389be988926e3c3cc46f6d95965e8aac6..689bcddf56879b9eedee1fbe6581669f76d36c04 100644
--- a/lib/aethyr/core/commands/emotes/yes.rb
+++ b/lib/aethyr/core/commands/emotes/yes.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/gait.rb b/lib/aethyr/core/commands/gait.rb
index ae22aa57e7ee25572502c662142076fa87104f71..75ef414c89572e31e9792060cc95fbad4dde14f8 100644
--- a/lib/aethyr/core/commands/gait.rb
+++ b/lib/aethyr/core/commands/gait.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/generic.rb b/lib/aethyr/core/commands/generic.rb
index e8c8f190052af45a814898f4e585f77276a887fd..b89b055cbea4ef835ab2c80c6e54e61e9e1488b6 100644
--- a/lib/aethyr/core/commands/generic.rb
+++ b/lib/aethyr/core/commands/generic.rb
@@ -12,7 +12,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/get.rb b/lib/aethyr/core/commands/get.rb
index 0c1f226ff7ddf6999bb0e36db0890a063f29d8fb..85b2ddade335d5c78b6547ab0fcc8f7763189787 100644
--- a/lib/aethyr/core/commands/get.rb
+++ b/lib/aethyr/core/commands/get.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
           
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/give.rb b/lib/aethyr/core/commands/give.rb
index 7570d50d489828beb407d8ed3192580fc4c41c13..2a1adbf642135ccdaebd0982ffa46dd85e3c373e 100644
--- a/lib/aethyr/core/commands/give.rb
+++ b/lib/aethyr/core/commands/give.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
           
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/inventory.rb b/lib/aethyr/core/commands/inventory.rb
index e8a4044e6cf5b1e91ceea3c02f44b43e046cb619..84d81ab0e53eff7b78bfa24a80b74dd8abe45a51 100644
--- a/lib/aethyr/core/commands/inventory.rb
+++ b/lib/aethyr/core/commands/inventory.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
           
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/issue.rb b/lib/aethyr/core/commands/issue.rb
index 6e2cd884d0d18cf751689abe321430535e044da0..30ea3a33d26aadcb8110952ff3ac3d8f243fc3ce 100644
--- a/lib/aethyr/core/commands/issue.rb
+++ b/lib/aethyr/core/commands/issue.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/kick.rb b/lib/aethyr/core/commands/kick.rb
index ee1ce3d2b2fc545aae2069ed7fc0978184be9576..c9a0653c66b46fbd3f65fcd9d1543cb02ae1621a 100644
--- a/lib/aethyr/core/commands/kick.rb
+++ b/lib/aethyr/core/commands/kick.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/locking.rb b/lib/aethyr/core/commands/locking.rb
index 16cad9da75da32c2f93d4bf7631a569ea1ede412..b777a55b314fa4769c9058a86043ed0934efd6ac 100644
--- a/lib/aethyr/core/commands/locking.rb
+++ b/lib/aethyr/core/commands/locking.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/look.rb b/lib/aethyr/core/commands/look.rb
index e32779dfdf3f811ea639e8b7de56b643421517dc..8ac3fc8171f6629ff327ac3d23f9a6db19abd68e 100644
--- a/lib/aethyr/core/commands/look.rb
+++ b/lib/aethyr/core/commands/look.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/map.rb b/lib/aethyr/core/commands/map.rb
index 3e7790f972e3f8dd537db3bbaa1a7fce6fdfe573..d493375e68a36785dabdedd9a32d7e919598e357 100644
--- a/lib/aethyr/core/commands/map.rb
+++ b/lib/aethyr/core/commands/map.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/more.rb b/lib/aethyr/core/commands/more.rb
index 8733b44afe6bdf2707bcf954886bfab9867312be..26ff0f9beebf375e810980c9e7a829c1c328a7b1 100644
--- a/lib/aethyr/core/commands/more.rb
+++ b/lib/aethyr/core/commands/more.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
           
           def player_input(data)
diff --git a/lib/aethyr/core/commands/move.rb b/lib/aethyr/core/commands/move.rb
index a1f4db69fb867ed844e3fe37c93909d7c6d721b8..e26feabb609e7ce34cd8aec584ad12d3883b78a1 100644
--- a/lib/aethyr/core/commands/move.rb
+++ b/lib/aethyr/core/commands/move.rb
@@ -15,7 +15,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/news.rb b/lib/aethyr/core/commands/news.rb
index 5cf35a8cae408c21e7bde3107b469c87af55b0ce..197716a0352487025ff994d7404ba862176eb0e7 100644
--- a/lib/aethyr/core/commands/news.rb
+++ b/lib/aethyr/core/commands/news.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/open.rb b/lib/aethyr/core/commands/open.rb
index 4dbd64eca8a238049dff6025f649787ec3af4569..72bc502929ad174093571be8ece47c286d0ba36f 100644
--- a/lib/aethyr/core/commands/open.rb
+++ b/lib/aethyr/core/commands/open.rb
@@ -14,7 +14,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/portal.rb b/lib/aethyr/core/commands/portal.rb
index 7eec926039984c581c9a705b3dac4413b377c392..b384f20fc3585e8b4eee4dec5a7265c7ca43680b 100644
--- a/lib/aethyr/core/commands/portal.rb
+++ b/lib/aethyr/core/commands/portal.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/pose.rb b/lib/aethyr/core/commands/pose.rb
index 2ea47e8d030f7d852c080e5789993798b52b84ba..71717e948ae0de236d4818a2629a19a401fb1e87 100644
--- a/lib/aethyr/core/commands/pose.rb
+++ b/lib/aethyr/core/commands/pose.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/punch.rb b/lib/aethyr/core/commands/punch.rb
index ef05ab23e33740f4638fbd87af8e02dc234e46f0..dd90dd4c4ba5c91c36b9f95bceecdf44619fc0ba 100644
--- a/lib/aethyr/core/commands/punch.rb
+++ b/lib/aethyr/core/commands/punch.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/put.rb b/lib/aethyr/core/commands/put.rb
index 1a3853fdf75ab242de0ca96a1f3a5aa3f9d1efb8..d694c98294453ab21cf54c3b24cf8b93e3008833 100644
--- a/lib/aethyr/core/commands/put.rb
+++ b/lib/aethyr/core/commands/put.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/quit.rb b/lib/aethyr/core/commands/quit.rb
index 4a85f1b334f9950602ce1b8e015a7b204ac228dd..e24e6d8ab241af17757a23dbecfeb83fd971b65c 100644
--- a/lib/aethyr/core/commands/quit.rb
+++ b/lib/aethyr/core/commands/quit.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
           
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/remove.rb b/lib/aethyr/core/commands/remove.rb
index 848f6e030ef2407ea75274ea4215d97953a5e0b7..42070d6bf83a4e4bc3bf6dc12e47075ed7b99035 100644
--- a/lib/aethyr/core/commands/remove.rb
+++ b/lib/aethyr/core/commands/remove.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/say.rb b/lib/aethyr/core/commands/say.rb
index c4ab4945dddf64f33f3693d1d3557da3e4f55220..f00b2a8c411f689c9a8e5c26da14c825905b3130 100644
--- a/lib/aethyr/core/commands/say.rb
+++ b/lib/aethyr/core/commands/say.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/set.rb b/lib/aethyr/core/commands/set.rb
index fead9608986fdb8da50dba19da708a745dbbf518..cbecf028716c881a0741efd331d7e4faf6c2d73c 100644
--- a/lib/aethyr/core/commands/set.rb
+++ b/lib/aethyr/core/commands/set.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/sit.rb b/lib/aethyr/core/commands/sit.rb
index 34bb68e7cdebaf6e3b0ae6379731cbebd32e69fa..a64a425ac1e1d4acae708b476ded9bef4aa26361 100644
--- a/lib/aethyr/core/commands/sit.rb
+++ b/lib/aethyr/core/commands/sit.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/skills.rb b/lib/aethyr/core/commands/skills.rb
index f216db328f1087f4362b9146e58175ced5cf6f58..6704dacaececfd07425234ff98242da3da36782b 100644
--- a/lib/aethyr/core/commands/skills.rb
+++ b/lib/aethyr/core/commands/skills.rb
@@ -13,7 +13,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/slash.rb b/lib/aethyr/core/commands/slash.rb
index dc94f708fae109161af747af39814a662f139259..54550a49448f661ba90b730a6eff05028b38b0e2 100644
--- a/lib/aethyr/core/commands/slash.rb
+++ b/lib/aethyr/core/commands/slash.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/stand.rb b/lib/aethyr/core/commands/stand.rb
index 328e22d49751b8179cb38089492e6811bd005953..2dc08af99a9b12621689e04eac4e93449b61b745 100644
--- a/lib/aethyr/core/commands/stand.rb
+++ b/lib/aethyr/core/commands/stand.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/tell.rb b/lib/aethyr/core/commands/tell.rb
index 201990311defdbad6fefc98018d1c6ef795db704..2dfe9902e5c7914eb9aa04fc8f220b644bf75953 100644
--- a/lib/aethyr/core/commands/tell.rb
+++ b/lib/aethyr/core/commands/tell.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/unwield.rb b/lib/aethyr/core/commands/unwield.rb
index 0b1841d80b784576fb9fe383243d03980750ab78..50203253f26b0aced38fbf7ac3ce2146138ace7b 100644
--- a/lib/aethyr/core/commands/unwield.rb
+++ b/lib/aethyr/core/commands/unwield.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/wear.rb b/lib/aethyr/core/commands/wear.rb
index 0ac3e8c8e246562e142b33dbf4a99ed4823582da..258623d9337ecbbb946e469e5e09ab77168bde85 100644
--- a/lib/aethyr/core/commands/wear.rb
+++ b/lib/aethyr/core/commands/wear.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/whereis.rb b/lib/aethyr/core/commands/whereis.rb
index 940f11ff7d4a607987dddd240527dc865043289a..2ae0c438aaa8a5047fc27c5c02134cf177f25299 100644
--- a/lib/aethyr/core/commands/whereis.rb
+++ b/lib/aethyr/core/commands/whereis.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/whisper.rb b/lib/aethyr/core/commands/whisper.rb
index 1d59c576d3658852a8deedf3ab81d62c55bf231c..027fac792c3f633013643c00db403981f045fa7e 100644
--- a/lib/aethyr/core/commands/whisper.rb
+++ b/lib/aethyr/core/commands/whisper.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/wield.rb b/lib/aethyr/core/commands/wield.rb
index 2ce23a2e2f1b849921389339624d40103b5aa48b..0b3b119330773f9986e73c0fc1fbf258eaf08481 100644
--- a/lib/aethyr/core/commands/wield.rb
+++ b/lib/aethyr/core/commands/wield.rb
@@ -11,7 +11,7 @@ module Aethyr
           end
 
           def self.object_added(data)
-            super(data, klass: self)
+            super(data, self)
           end
 
           def player_input(data)