diff --git a/bukkit/acf-bukkit.iml b/bukkit/acf-bukkit.iml
index afbbfe30..1d608a14 100644
--- a/bukkit/acf-bukkit.iml
+++ b/bukkit/acf-bukkit.iml
@@ -19,7 +19,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="acf-core" />
-    <orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.12-pre2-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index ae9c2ba7..ac7ef831 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>co.aikar</groupId>
             <artifactId>minecraft-timings</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java b/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
index e14aa298..59151272 100644
--- a/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
+++ b/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
@@ -24,6 +24,7 @@
 package co.aikar.commands;
 
 import co.aikar.commands.apachecommonslang.ApacheCommonsExceptionUtil;
+import co.aikar.timings.lib.MCTiming;
 import co.aikar.timings.lib.TimingManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
@@ -57,10 +58,13 @@ public class BukkitCommandManager extends CommandManager {
     protected Map<String, BukkitRootCommand> registeredCommands = new HashMap<>();
     protected BukkitCommandContexts contexts;
     protected BukkitCommandCompletions completions;
+    MCTiming commandTiming;
 
+    @SuppressWarnings("JavaReflectionMemberAccess")
     public BukkitCommandManager(Plugin plugin) {
         this.plugin = plugin;
         this.timingManager = TimingManager.of(plugin);
+        this.commandTiming = this.timingManager.of("Commands");
         CommandMap commandMap = null;
         try {
             Server server = Bukkit.getServer();
@@ -194,7 +198,7 @@ public class BukkitCommandManager extends CommandManager {
 
     @Override
     public RegisteredCommand createRegisteredCommand(BaseCommand command, String cmdName, Method method, String prefSubCommand) {
-        return new RegisteredCommand(command, cmdName, method, prefSubCommand);
+        return new BukkitRegisteredCommand(command, cmdName, method, prefSubCommand);
     }
 
     @Override
diff --git a/bukkit/src/main/java/co/aikar/commands/BukkitRegisteredCommand.java b/bukkit/src/main/java/co/aikar/commands/BukkitRegisteredCommand.java
index 7a46daa5..bbfcec7b 100644
--- a/bukkit/src/main/java/co/aikar/commands/BukkitRegisteredCommand.java
+++ b/bukkit/src/main/java/co/aikar/commands/BukkitRegisteredCommand.java
@@ -24,6 +24,7 @@
 package co.aikar.commands;
 
 import co.aikar.timings.lib.MCTiming;
+import co.aikar.timings.lib.TimingManager;
 
 import java.lang.reflect.Method;
 
@@ -31,7 +32,8 @@ public class BukkitRegisteredCommand extends RegisteredCommand<BukkitCommandExec
     private final MCTiming timing;
     BukkitRegisteredCommand(BaseCommand scope, String command, Method method, String prefSubCommand) {
         super(scope, command, method, prefSubCommand);
-        this.timing = ((BukkitCommandManager) scope.manager).getTimings().of("Command: " + command);
+        BukkitCommandManager manager = (BukkitCommandManager) scope.manager;
+        this.timing = manager.getTimings().of("Command: " + this.command, manager.commandTiming);
     }
 
 
diff --git a/example/acf-example.iml b/example/acf-example.iml
index 9b892ff5..6dc644cd 100644
--- a/example/acf-example.iml
+++ b/example/acf-example.iml
@@ -36,7 +36,7 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-all:5.0.4" level="project" />
     <orderEntry type="module" module-name="acf-bukkit" />
     <orderEntry type="module" module-name="acf-core" />
-    <orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/paper/acf-paper.iml b/paper/acf-paper.iml
index 8245c319..cb34f812 100644
--- a/paper/acf-paper.iml
+++ b/paper/acf-paper.iml
@@ -20,7 +20,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="acf-bukkit" />
     <orderEntry type="module" module-name="acf-core" />
-    <orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.12-pre2-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
diff --git a/sponge/src/main/java/co/aikar/commands/SpongeCommandManager.java b/sponge/src/main/java/co/aikar/commands/SpongeCommandManager.java
index 517562ff..8f6c91f3 100644
--- a/sponge/src/main/java/co/aikar/commands/SpongeCommandManager.java
+++ b/sponge/src/main/java/co/aikar/commands/SpongeCommandManager.java
@@ -43,9 +43,11 @@ public class SpongeCommandManager extends CommandManager {
     protected Map<String, SpongeRootCommand> registeredCommands = new HashMap<>();
     protected SpongeCommandContexts contexts;
     protected SpongeCommandCompletions completions;
+    private Timing commandTiming;
 
     public SpongeCommandManager(PluginContainer plugin) {
         this.plugin = plugin;
+        this.commandTiming = Timings.of(plugin, "Commands");
     }
 
     @Override
@@ -89,8 +91,8 @@ public class SpongeCommandManager extends CommandManager {
         }
     }
 
-    public Timing createTiming(final SpongeRegisteredCommand command) {
-        return Timings.of(this.plugin, "Command: " + command.command);
+    public Timing createTiming(final String name) {
+        return Timings.of(this.plugin, name, this.commandTiming);
     }
 
     @Override
@@ -118,7 +120,7 @@ public class SpongeCommandManager extends CommandManager {
 
     @Override
     public RegisteredCommand createRegisteredCommand(BaseCommand command, String cmdName, Method method, String prefSubCommand) {
-        return new RegisteredCommand(command, cmdName, method, prefSubCommand);
+        return new SpongeRegisteredCommand(command, cmdName, method, prefSubCommand);
     }
 
     @Override
diff --git a/sponge/src/main/java/co/aikar/commands/SpongeRegisteredCommand.java b/sponge/src/main/java/co/aikar/commands/SpongeRegisteredCommand.java
index 19a273fa..f3cac8ae 100644
--- a/sponge/src/main/java/co/aikar/commands/SpongeRegisteredCommand.java
+++ b/sponge/src/main/java/co/aikar/commands/SpongeRegisteredCommand.java
@@ -33,7 +33,7 @@ public class SpongeRegisteredCommand extends RegisteredCommand<SpongeCommandExec
 
     SpongeRegisteredCommand(BaseCommand scope, String command, Method method, String prefSubCommand) {
         super(scope, command, method, prefSubCommand);
-        this.timing = ((SpongeCommandManager) scope.manager).createTiming(this);
+        this.timing = ((SpongeCommandManager) scope.manager).createTiming("Command: " + this.command);
     }
 
     @Override