diff --git a/src/pocketmine/command/SimpleCommandMap.php b/src/pocketmine/command/SimpleCommandMap.php
index 1587344a1..b8e2e288a 100644
--- a/src/pocketmine/command/SimpleCommandMap.php
+++ b/src/pocketmine/command/SimpleCommandMap.php
@@ -85,48 +85,52 @@ class SimpleCommandMap implements CommandMap{
 	}
 
 	private function setDefaultCommands(){
-		$this->register("pocketmine", new VersionCommand("version"));
-		$this->register("pocketmine", new PluginsCommand("plugins"));
-		$this->register("pocketmine", new SeedCommand("seed"));
-		$this->register("pocketmine", new HelpCommand("help"));
-		$this->register("pocketmine", new StopCommand("stop"));
-		$this->register("pocketmine", new TellCommand("tell"));
-		$this->register("pocketmine", new DefaultGamemodeCommand("defaultgamemode"));
-		$this->register("pocketmine", new BanCommand("ban"));
-		$this->register("pocketmine", new BanIpCommand("ban-ip"));
-		$this->register("pocketmine", new BanListCommand("banlist"));
-		$this->register("pocketmine", new PardonCommand("pardon"));
-		$this->register("pocketmine", new PardonIpCommand("pardon-ip"));
-		$this->register("pocketmine", new SayCommand("say"));
-		$this->register("pocketmine", new MeCommand("me"));
-		$this->register("pocketmine", new ListCommand("list"));
-		$this->register("pocketmine", new DifficultyCommand("difficulty"));
-		$this->register("pocketmine", new KickCommand("kick"));
-		$this->register("pocketmine", new OpCommand("op"));
-		$this->register("pocketmine", new DeopCommand("deop"));
-		$this->register("pocketmine", new WhitelistCommand("whitelist"));
-		$this->register("pocketmine", new SaveOnCommand("save-on"));
-		$this->register("pocketmine", new SaveOffCommand("save-off"));
-		$this->register("pocketmine", new SaveCommand("save-all"));
-		$this->register("pocketmine", new GiveCommand("give"));
-		$this->register("pocketmine", new EffectCommand("effect"));
-		$this->register("pocketmine", new EnchantCommand("enchant"));
-		$this->register("pocketmine", new ParticleCommand("particle"));
-		$this->register("pocketmine", new GamemodeCommand("gamemode"));
-		$this->register("pocketmine", new KillCommand("kill"));
-		$this->register("pocketmine", new SpawnpointCommand("spawnpoint"));
-		$this->register("pocketmine", new SetWorldSpawnCommand("setworldspawn"));
-		$this->register("pocketmine", new TeleportCommand("tp"));
-		$this->register("pocketmine", new TimeCommand("time"));
-		$this->register("pocketmine", new TimingsCommand("timings"));
-		$this->register("pocketmine", new TitleCommand("title"));
-		$this->register("pocketmine", new ReloadCommand("reload"));
-		$this->register("pocketmine", new TransferServerCommand("transferserver"));
+		$this->registerAll("pocketmine", [
+			new BanCommand("ban"),
+			new BanIpCommand("ban-ip"),
+			new BanListCommand("banlist"),
+			new DefaultGamemodeCommand("defaultgamemode"),
+			new DeopCommand("deop"),
+			new DifficultyCommand("difficulty"),
+			new EffectCommand("effect"),
+			new EnchantCommand("enchant"),
+			new GamemodeCommand("gamemode"),
+			new GiveCommand("give"),
+			new HelpCommand("help"),
+			new KickCommand("kick"),
+			new KillCommand("kill"),
+			new ListCommand("list"),
+			new MeCommand("me"),
+			new OpCommand("op"),
+			new PardonCommand("pardon"),
+			new PardonIpCommand("pardon-ip"),
+			new ParticleCommand("particle"),
+			new PluginsCommand("plugins"),
+			new ReloadCommand("reload"),
+			new SaveCommand("save-all"),
+			new SaveOffCommand("save-off"),
+			new SaveOnCommand("save-on"),
+			new SayCommand("say"),
+			new SeedCommand("seed"),
+			new SetWorldSpawnCommand("setworldspawn"),
+			new SpawnpointCommand("spawnpoint"),
+			new StopCommand("stop"),
+			new TeleportCommand("tp"),
+			new TellCommand("tell"),
+			new TimeCommand("time"),
+			new TimingsCommand("timings"),
+			new TitleCommand("title"),
+			new TransferServerCommand("transferserver"),
+			new VersionCommand("version"),
+			new WhitelistCommand("whitelist")
+		]);
 
 		if($this->server->getProperty("debug.commands", false)){
-			$this->register("pocketmine", new StatusCommand("status"));
-			$this->register("pocketmine", new GarbageCollectorCommand("gc"));
-			$this->register("pocketmine", new DumpMemoryCommand("dumpmemory"));
+			$this->registerAll("pocketmine", [
+				new StatusCommand("status"),
+				new GarbageCollectorCommand("gc"),
+				new DumpMemoryCommand("dumpmemory")
+			]);
 		}
 	}