diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 174665cb2..26493260d 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -5,6 +5,8 @@
       <value>
         <option name="AUTODETECT_INDENTS" value="false" />
         <option name="LINE_SEPARATOR" value="&#10;" />
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
         <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
         <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
         <XML>
diff --git a/src/main/java/fr/xephi/authme/command/CommandInitializer.java b/src/main/java/fr/xephi/authme/command/CommandInitializer.java
index a8dceff04..f0950bdfb 100644
--- a/src/main/java/fr/xephi/authme/command/CommandInitializer.java
+++ b/src/main/java/fr/xephi/authme/command/CommandInitializer.java
@@ -162,7 +162,7 @@ public final class CommandInitializer {
             .build();
 
         // Register the setemail command
-        CommandDescription setEmailCommand = CommandDescription.builder()
+        CommandDescription.builder()
             .executableCommand(new SetEmailCommand())
             .parent(AUTHME_BASE)
             .labels("chgemail", "chgmail", "setemail", "setmail")
@@ -174,74 +174,80 @@ public final class CommandInitializer {
             .build();
 
         // Register the getip command
-        CommandDescription getIpCommand = new CommandDescription(new GetIpCommand(), new ArrayList<String>() {
-            {
-                add("getip");
-                add("ip");
-            }
-        }, "Get player's IP", "Get the IP address of the specified online player.", AUTHME_BASE);
-        getIpCommand.setCommandPermissions(AdminPermission.GET_IP, OP_ONLY);
-        getIpCommand.addArgument(new CommandArgumentDescription("player", "Online player name", true));
+        CommandDescription.builder()
+        		.executableCommand(new GetIpCommand())
+        		.parent(AUTHME_BASE)
+        		.labels("getip", "ip")
+        		.description("Get player's IP")
+        		.detailedDescription("Get the IP address of the specified online player.")
+        		.permissions(OP_ONLY, AdminPermission.GET_IP)
+        		.withArgument("player", "Player Name", false)
+        		.build();
+
 
         // Register the spawn command
-        CommandDescription spawnCommand = new CommandDescription(new SpawnCommand(), new ArrayList<String>() {
-            {
-                add("spawn");
-                add("home");
-            }
-        }, "Teleport to spawn", "Teleport to the spawn.", AUTHME_BASE);
-        spawnCommand.setCommandPermissions(AdminPermission.SPAWN, OP_ONLY);
+        CommandDescription.builder()
+        		.executableCommand(new SpawnCommand())
+        		.parent(AUTHME_BASE)
+        		.labels("spawn", "home")
+        		.description("Teleport to spawn")
+        		.detailedDescription("Teleport to the spawn.")
+        		.permissions(OP_ONLY, AdminPermission.SPAWN)
+        		.withArgument("player", "Player Name", false)
+        		.build();
 
         // Register the setspawn command
-        CommandDescription setSpawnCommand = new CommandDescription(new SetSpawnCommand(), new ArrayList<String>() {
-            {
-                add("setspawn");
-                add("chgspawn");
-            }
-        }, "Change the spawn", "Change the player's spawn to your current position.", AUTHME_BASE);
-        setSpawnCommand.setCommandPermissions(AdminPermission.SET_SPAWN, OP_ONLY);
+        CommandDescription.builder()
+        		.executableCommand(new SetSpawnCommand())
+        		.parent(AUTHME_BASE)
+        		.labels("setspawn", "chgspawn")
+        		.description("Change the spawn")
+        		.detailedDescription("Change the player's spawn to your current position.")
+        		.permissions(OP_ONLY, AdminPermission.SET_SPAWN)
+        		.build();
 
         // Register the firstspawn command
-        CommandDescription firstSpawnCommand = new CommandDescription(new FirstSpawnCommand(), new ArrayList<String>() {
-            {
-                add("firstspawn");
-                add("firsthome");
-            }
-        }, "Teleport to first spawn", "Teleport to the first spawn.", AUTHME_BASE);
-        firstSpawnCommand.setCommandPermissions(AdminPermission.FIRST_SPAWN, OP_ONLY);
+        CommandDescription.builder()
+        		.executableCommand(new FirstSpawnCommand())
+        		.parent(AUTHME_BASE)
+        		.labels("firstspawn", "firsthome")
+        		.description("Teleport to first spawn")
+        		.detailedDescription("Teleport to the first spawn.")
+        		.permissions(OP_ONLY, AdminPermission.FIRST_SPAWN)
+        		.build();
+
 
         // Register the setfirstspawn command
-        CommandDescription setFirstSpawnCommand = new CommandDescription(new SetFirstSpawnCommand(), new ArrayList<String>() {
-            {
-                add("setfirstspawn");
-                add("chgfirstspawn");
-            }
-        }, "Change the first spawn", "Change the first player's spawn to your current position.", AUTHME_BASE);
-        setFirstSpawnCommand.setCommandPermissions(AdminPermission.SET_FIRST_SPAWN, OP_ONLY);
+        CommandDescription.builder()
+        		.executableCommand(new SetFirstSpawnCommand())
+        		.parent(AUTHME_BASE)
+        		.labels("setfirstspawn", "chgfirstspawn")
+        		.description("Change the first spawn")
+        		.detailedDescription("Change the first player's spawn to your current position.")
+        		.permissions(OP_ONLY, AdminPermission.SET_FIRST_SPAWN)
+        		.build();
 
         // Register the purge command
-        CommandDescription purgeCommand = new CommandDescription(new PurgeCommand(), new ArrayList<String>() {
-            {
-                add("purge");
-                add("delete");
-            }
-        }, "Purge old data", "Purge old AuthMeReloaded data longer than the specified amount of days ago.", AUTHME_BASE);
-        purgeCommand.setCommandPermissions(AdminPermission.PURGE, OP_ONLY);
-        purgeCommand.addArgument(new CommandArgumentDescription("days", "Number of days", false));
+        CommandDescription.builder()
+        		.executableCommand(new PurgeCommand())
+        		.parent(AUTHME_BASE)
+        		.labels("purge", "delete")
+        		.description("Purge old data")
+        		.detailedDescription("Purge old AuthMeReloaded data longer than the specified amount of days ago.")
+        		.permissions(OP_ONLY, AdminPermission.PURGE)
+        		.withArgument("days", "Number of days", false)
+        		.build();
 
         // Register the purgelastposition command
-        CommandDescription purgeLastPositionCommand = new CommandDescription(new PurgeLastPositionCommand(), new ArrayList<String>() {
-            {
-                add("resetpos");
-                add("purgelastposition");
-                add("purgelastpos");
-                add("resetposition");
-                add("resetlastposition");
-                add("resetlastpos");
-            }
-        }, "Purge player's last position", "Purge the last know position of the specified player.", AUTHME_BASE);
-        purgeLastPositionCommand.setCommandPermissions(AdminPermission.PURGE_LAST_POSITION, OP_ONLY);
-        purgeLastPositionCommand.addArgument(new CommandArgumentDescription("player", "Player name", true));
+        CommandDescription.builder()
+        		.executableCommand(new PurgeLastPositionCommand())
+        		.parent(AUTHME_BASE)
+        		.labels("resetpos", "purgelastposition", "purgelastpos", "resetposition", "resetlastposition", "resetlastpos")
+        		.description("Purge player's last position")
+        		.detailedDescription("Purge the last know position of the specified player.")
+        		.permissions(OP_ONLY, AdminPermission.PURGE_LAST_POSITION)
+        		.withArgument("player", "Player name", false)
+        		.build();
 
         // Register the purgebannedplayers command
         CommandDescription purgeBannedPlayersCommand = new CommandDescription(new PurgeBannedPlayersCommand(), new ArrayList<String>() {
diff --git a/src/main/java/fr/xephi/authme/permission/AdminPermission.java b/src/main/java/fr/xephi/authme/permission/AdminPermission.java
index 335875a87..470d3a4bb 100644
--- a/src/main/java/fr/xephi/authme/permission/AdminPermission.java
+++ b/src/main/java/fr/xephi/authme/permission/AdminPermission.java
@@ -8,97 +8,102 @@ public enum AdminPermission implements PermissionNode {
     /**
      * Administrator command to register a new user.
      */
-    REGISTER("authme.command.admin.register"),
+    REGISTER("authme.admin.register"),
 
     /**
      * Administrator command to unregister an existing user.
      */
-    UNREGISTER("authme.command.admin.unregister"),
+    UNREGISTER("authme.admin.unregister"),
 
     /**
      * Administrator command to force-login an existing user.
      */
-    FORCE_LOGIN("authme.command.admin.forcelogin"),
+    FORCE_LOGIN("authme.admin.forcelogin"),
 
     /**
      * Administrator command to change the password of a user.
      */
-    CHANGE_PASSWORD("authme.command.admin.changepassword"),
+    CHANGE_PASSWORD("authme.admin.changepassword"),
 
     /**
-     * Administrator command to see the last login date and time of an user.
+     * Administrator command to see the last login date and time of a user.
      */
-    LAST_LOGIN("authme.command.admin.lastlogin"),
+    LAST_LOGIN("authme.admin.lastlogin"),
 
     /**
-     * Administrator command to see all accounts associated with an user.
+     * Administrator command to see all accounts associated with a user.
      */
-    ACCOUNTS("authme.command.admin.accounts"),
+    ACCOUNTS("authme.admin.accounts"),
 
     /**
-     * Administrator command to get the email address of an user, if set.
+     * Administrator command to get the email address of a user, if set.
      */
-    GET_EMAIL("authme.command.admin.getemail"),
+    GET_EMAIL("authme.admin.getemail"),
 
     /**
-     * Administrator command to set or change the email adress of an user.
+     * Administrator command to set or change the email address of a user.
      */
-    CHANGE_EMAIL("authme.command.admin.changemail"),
+    CHANGE_EMAIL("authme.admin.changemail"),
 
     /**
-     * Administrator command to get the last known IP of an user.
+     * Administrator command to get the last known IP of a user.
      */
-    GET_IP("authme.command.admin.getip"),
+    GET_IP("authme.admin.getip"),
 
     /**
      * Administrator command to teleport to the AuthMe spawn.
      */
-    SPAWN("authme.command.admin.spawn"),
+    SPAWN("authme.admin.spawn"),
 
     /**
      * Administrator command to set the AuthMe spawn.
      */
-    SET_SPAWN("authme.command.admin.setspawn"),
+    SET_SPAWN("authme.admin.setspawn"),
 
     /**
      * Administrator command to teleport to the first AuthMe spawn.
      */
-    FIRST_SPAWN("authme.command.admin.firstspawn"),
+    FIRST_SPAWN("authme.admin.firstspawn"),
 
     /**
      * Administrator command to set the first AuthMe spawn.
      */
-    SET_FIRST_SPAWN("authme.command.admin.setfirstspawn"),
+    SET_FIRST_SPAWN("authme.admin.setfirstspawn"),
 
     /**
      * Administrator command to purge old user data.
      */
-    PURGE("authme.command.admin.purge"),
+    PURGE("authme.admin.purge"),
 
     /**
-     * Administrator command to purge the last position of an user.
+     * Administrator command to purge the last position of a user.
      */
-    PURGE_LAST_POSITION("authme.command.admin.purgelastpos"),
+    PURGE_LAST_POSITION("authme.admin.purgelastpos"),
 
     /**
      * Administrator command to purge all data associated with banned players.
      */
-    PURGE_BANNED_PLAYERS("authme.command.admin.purgebannedplayers"),
+    PURGE_BANNED_PLAYERS("authme.admin.purgebannedplayers"),
 
     /**
      * Administrator command to toggle the AntiBot protection status.
      */
-    SWITCH_ANTIBOT("authme.command.admin.switchantibot"),
+    SWITCH_ANTIBOT("authme.admin.switchantibot"),
 
     /**
      * Administrator command to convert old or other data to AuthMe data.
      */
-    CONVERTER("authme.command.admin.converter"),
+    CONVERTER("authme.admin.converter"),
 
     /**
      * Administrator command to reload the plugin configuration.
      */
-    RELOAD("authme.command.admin.reload");
+    RELOAD("authme.admin.reload"),
+
+	/**
+	 * Give access to all admin commands.
+	 */
+	ALL("authme.admin.*");
 
     /**
      * Permission node.
@@ -107,7 +112,8 @@ public enum AdminPermission implements PermissionNode {
 
     /**
      * Get the permission node.
-     * @return
+     *
+     * @return Permission node.
      */
     @Override
     public String getNode() {
diff --git a/src/main/java/fr/xephi/authme/permission/PlayerPermission.java b/src/main/java/fr/xephi/authme/permission/PlayerPermission.java
index 0488a67ad..4ef0aca2e 100644
--- a/src/main/java/fr/xephi/authme/permission/PlayerPermission.java
+++ b/src/main/java/fr/xephi/authme/permission/PlayerPermission.java
@@ -18,47 +18,47 @@ public enum PlayerPermission implements PermissionNode {
     /**
      * Command permission to login.
      */
-    LOGIN("authme.command.player.login"),
+    LOGIN("authme.player.login"),
 
     /**
      * Command permission to logout.
      */
-    LOGOUT("authme.command.player.logout"),
+    LOGOUT("authme.player.logout"),
 
     /**
      * Command permission to register.
      */
-    REGISTER("authme.command.player.register"),
+    REGISTER("authme.player.register"),
 
     /**
      * Command permission to unregister.
      */
-    UNREGISTER("authme.command.player.unregister"),
+    UNREGISTER("authme.player.unregister"),
 
     /**
      * Command permission to change the password.
      */
-    CHANGE_PASSWORD("authme.command.player.changepassword"),
+    CHANGE_PASSWORD("authme.player.changepassword"),
 
     /**
      * Command permission to add an email address.
      */
-    ADD_EMAIL("authme.command.player.email.add"),
+    ADD_EMAIL("authme.player.email.add"),
 
     /**
      * Command permission to change the email address.
      */
-    CHANGE_EMAIL("authme.command.player.email.change"),
+    CHANGE_EMAIL("authme.player.email.change"),
 
     /**
      * Command permission to recover an account using it's email address.
      */
-    RECOVER_EMAIL("authme.command.player.email.recover"),
+    RECOVER_EMAIL("authme.player.email.recover"),
 
     /**
      * Command permission to use captcha.
      */
-    CAPTCHA("authme.command.player.captcha"),
+    CAPTCHA("authme.player.captcha"),
 
     /**
      * Permission for users a login can be forced to.
@@ -68,17 +68,22 @@ public enum PlayerPermission implements PermissionNode {
     /**
      * Permission for users to bypass force-survival mode.
      */
-    BYPASS_FORCE_SURVIVAL("authme.command.player.bypassforcesurvival"),
+    BYPASS_FORCE_SURVIVAL("authme.player.bypassforcesurvival"),
 
     /**
      * Permission for users to allow two accounts.
      */
-    ALLOW_MULTIPLE_ACCOUNTS("authme.command.player.allow2accounts"),
+    ALLOW_MULTIPLE_ACCOUNTS("authme.player.allow2accounts"),
 
     /**
      * Permission for user to see other accounts.
      */
-    SEE_OTHER_ACCOUNTS("authme.command.player.seeotheraccounts");
+    SEE_OTHER_ACCOUNTS("authme.player.seeotheraccounts"),
+
+	/**
+	 *
+	 */
+	ALL_COMMANDS("authme.player.*");
 
     /**
      * Permission node.