diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsCommandNode.java b/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsCommandNode.java
index cd7c0a690..25fb0779e 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsCommandNode.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsCommandNode.java
@@ -82,7 +82,11 @@ public abstract class EssentialsCommandNode<T> {
         }
 
         public void execute(final RunHandler<T> runHandler) {
-            this.execute(runHandler, ctx -> new ArrayList<>());
+            this.execute(runHandler, ctx -> Collections.emptyList());
+        }
+
+        public void execute(final LegacyRunHandler<T> runHandler) {
+            this.execute(runHandler, ctx -> Collections.emptyList());
         }
 
         public void execute(final RunHandler<T> runHandler, final List<String> tabValues) {
@@ -225,6 +229,17 @@ public abstract class EssentialsCommandNode<T> {
         void handle(WalkContext<T> ctx) throws Exception;
     }
 
+    // todo: not sure whether to keep or to rewrite usages
+    @Deprecated
+    public interface LegacyRunHandler<T> extends RunHandler<T> {
+        @Override
+        default void handle(WalkContext<T> ctx) throws Exception {
+            handle(ctx.server, ctx.sender, ctx.label, ctx.args);
+        }
+
+        void handle(Server server, T sender, String label, String[] args) throws Exception;
+    }
+
     public interface TabHandler<T> {
         List<String> handle(WalkContext<T> ctx) throws Exception;
     }