diff --git a/src/main/java/net/pingex/dcf/core/CoreEventsHandler.java b/src/main/java/net/pingex/dcf/core/CoreEventsHandler.java
index 0eba31b..20eb9ad 100644
--- a/src/main/java/net/pingex/dcf/core/CoreEventsHandler.java
+++ b/src/main/java/net/pingex/dcf/core/CoreEventsHandler.java
@@ -94,7 +94,7 @@ public class CoreEventsHandler
 	public static void pluginRunning(PluginWrapper plugin)
 	{
 		EventManager.getInstance().checkAndRegister(plugin); // Hook: event handlers
-		// TODO: Hook: register commands (if implements appropriate interface)
+		CommandHandler.registerPlugin(plugin); // Hook: commands handler
 	}
 
 	/**
@@ -104,7 +104,7 @@ public class CoreEventsHandler
 	public static void pluginStopped(PluginWrapper plugin)
 	{
 		EventManager.getInstance().unregister(plugin); // Hook: event handlers
-		// TODO: Hook: unregister commands
+		CommandHandler.unregisterPlugin(plugin); // Hook: commands handler
 	}
 
 	/**