diff --git a/lib/aethyr/core/commands/admin/admin_handler.rb b/lib/aethyr/core/commands/admin/admin_handler.rb
index ecc9c5d1d097c1f41a38940665769cd0116a0302..1826ab7f8df7f78f786985a3922dae1bba6cbd7d 100644
--- a/lib/aethyr/core/commands/admin/admin_handler.rb
+++ b/lib/aethyr/core/commands/admin/admin_handler.rb
@@ -7,12 +7,12 @@ module Aethyr
         super(player, commands, *args)
       end
 
-      def self.admin_object_added(data, klass)
+      protected
+      def self.object_added(data, child_class)
         return unless (data[:game_object].is_a? Player) && data[:game_object].admin
-        data[:game_object].subscribe(klass.new(data[:game_object]))
+        data[:game_object].subscribe(child_class.new(data[:game_object]))
       end
 
-      protected
       #Tail a file
       def tail file, lines = 10
         require 'util/tail'
diff --git a/lib/aethyr/core/commands/admin/alook.rb b/lib/aethyr/core/commands/admin/alook.rb
index 712f57693cc9717b8d8f72ce03ff92e5ef6a8cbb..fc27ae15c2507fa86f3b114f15ab46cc6117ed02 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)
-            return Aethyr::Extend::AdminHandler.admin_object_added(data, AlookHandler)
+            super(data, klass: self)
           end
 
           def player_input(data)
diff --git a/lib/aethyr/core/commands/command_handler.rb b/lib/aethyr/core/commands/command_handler.rb
index 9765552419c8491401af04b8c5fab58c47964f7a..93dba7e012887306c744d568bb109c850b2387bf 100644
--- a/lib/aethyr/core/commands/command_handler.rb
+++ b/lib/aethyr/core/commands/command_handler.rb
@@ -25,9 +25,9 @@ module Aethyr
 
       protected
       #event listener parent that listens for when a new user is added to the manager
-      def self.object_added(data, klass: child_class)
+      def self.object_added(data, child_class)
         return unless data[:game_object].is_a? Player
-        data[:game_object].subscribe(klass.new(data[:game_object]))
+        data[:game_object].subscribe(child_class.new(data[:game_object]))
       end
 
     end