diff --git a/docs/AxonClient.md b/docs/AxonClient.md
index 50f4cb9d..76834e21 100644
--- a/docs/AxonClient.md
+++ b/docs/AxonClient.md
@@ -1,3 +1,17 @@
+## Classes
+
+<dl>
+<dt><a href="#AxonClient">AxonClient</a> ⇐ <code>EventEmitter</code></dt>
+<dd></dd>
+</dl>
+
+## Typedefs
+
+<dl>
+<dt><a href="#Extensions">Extensions</a> : <code>Object</code></dt>
+<dd></dd>
+</dl>
+
 <a name="AxonClient"></a>
 
 ## AxonClient ⇐ <code>EventEmitter</code>
@@ -24,6 +38,7 @@
 | axonUtils | <code>[Axon[Utils](Utility/Utils)](Utility/Axon[Utils](Utility/Utils))</code> | Util methods (AxonCore) |
 | utils | <code>[Utils](Utility/Utils)</code> | Utils methods (general) |
 | DBProvider | <code>[ADBProvider](Database/ADBProvider)</code> | The DBProvider instance |
+| extensions | [<code>Extensions</code>](#Extensions) | AxonCore extensions |
 | _configs | <code>Object</code> | configs (webhooks, template, custom) |
 | _configs.webhooks | <code>Object.&lt;string, {id: String, token: String}&gt;</code> | Webhooks configs with all webhooks id and tokens |
 | _configs.template | <code>Object</code> | Template config |
@@ -419,3 +434,7 @@ Creates an AxonClient instance.
 | [axonOptions] | <code>[AxonOptions](Core/AxonOptions)</code> | <code>{}</code> | Axon options |
 | [modules] | <code>Object.&lt;string, [Module](Modules/Module)&gt;</code> | <code>{}</code> | Object with all modules to add in the bot |
 
+<a name="Extensions"></a>
+
+## Extensions : <code>Object</code>
+**Kind**: global typedef  
diff --git a/docs/Commands/Command.md b/docs/Commands/Command.md
index 487fb2ad..b4359377 100644
--- a/docs/Commands/Command.md
+++ b/docs/Commands/Command.md
@@ -45,8 +45,6 @@
     * [new Command()](#new_Command_new)
     * _instance_
         * [.module](#Command+module) : <code>Module</code>
-        * [.template](#Command+template) : [<code>AxonTemplate</code>](#AxonTemplate)
-        * [.library](#Command+library) : <code>LibraryInterface</code>
         * [.fullLabel](#Command+fullLabel) : <code>String</code>
         * [.init()](#Command+init) ⇒
         * [._init()](#Command+_init) ⇒ <code>Boolean</code>
@@ -72,20 +70,6 @@ AxonCore - Command constructor
 ### command.module : <code>Module</code>
 Returns the parent module instance
 
-**Kind**: instance property of [<code>Command</code>](#Command)  
-**Read only**: true  
-<a name="Command+template"></a>
-
-### command.template : [<code>AxonTemplate</code>](#AxonTemplate)
-Returns the template object
-
-**Kind**: instance property of [<code>Command</code>](#Command)  
-**Read only**: true  
-<a name="Command+library"></a>
-
-### command.library : <code>LibraryInterface</code>
-Returns the library Interface instance
-
 **Kind**: instance property of [<code>Command</code>](#Command)  
 **Read only**: true  
 <a name="Command+fullLabel"></a>
diff --git a/docs/Commands/CommandEnvironment.md b/docs/Commands/CommandEnvironment.md
index 7b493ca3..e9705c1f 100644
--- a/docs/Commands/CommandEnvironment.md
+++ b/docs/Commands/CommandEnvironment.md
@@ -13,6 +13,7 @@
 | guildConfig | <code>[GuildConfig](Core/GuildConfig)</code> | The GuildConfig data-structure with all DB saved settings |
 | prefix | <code>String</code> | The prefix used for this command |
 | command | <code>String</code> | The full label of the command being executed |
+| usedCommandLabel | <code>String</code> | The used label of the command being executed |
 | executionType | <code>COMMAND\_EXECUTION\_TYPES</code> | Execution type: admin, owner, regular |
 
 
@@ -23,7 +24,7 @@
         * [.isOwner](#CommandEnvironment+isOwner) : <code>Boolean</code>
         * [.setPrefix(prefix)](#CommandEnvironment+setPrefix) ⇒ <code>[CommandEnvironment](Commands/CommandEnvironment)</code>
         * [.setGuildConfig(guildConfig)](#CommandEnvironment+setGuildConfig) ⇒ <code>[CommandEnvironment](Commands/CommandEnvironment)</code>
-        * [.setCommand(command)](#CommandEnvironment+setCommand) ⇒ <code>[CommandEnvironment](Commands/CommandEnvironment)</code>
+        * [.setCommand(command, usedLabel)](#CommandEnvironment+setCommand) ⇒ <code>[CommandEnvironment](Commands/CommandEnvironment)</code>
         * [.resolveArgs(parser, args)](#CommandEnvironment+resolveArgs)
     * _static_
         * [.CommandEnvironment](#CommandEnvironment.CommandEnvironment)
@@ -74,7 +75,7 @@ Set the guildConfig
 
 <a name="CommandEnvironment+setCommand"></a>
 
-### commandEnvironment.setCommand(command) ⇒ <code>[CommandEnvironment](Commands/CommandEnvironment)</code>
+### commandEnvironment.setCommand(command, usedLabel) ⇒ <code>[CommandEnvironment](Commands/CommandEnvironment)</code>
 Set the command label from the command object
 
 **Kind**: instance method of [<code>CommandEnvironment</code>](#CommandEnvironment)  
@@ -83,6 +84,7 @@ Set the command label from the command object
 | Param | Type |
 | --- | --- |
 | command | <code>[Command](Commands/Command)</code> | 
+| usedLabel | <code>String</code> | 
 
 <a name="CommandEnvironment+resolveArgs"></a>
 
diff --git a/docs/Utility/Utils.md b/docs/Utility/Utils.md
index fe062df8..7fd25b55 100644
--- a/docs/Utility/Utils.md
+++ b/docs/Utility/Utils.md
@@ -35,7 +35,7 @@
         * [.axon](#Utils+axon) : <code>AxonClient</code>
         * [.bot](#Utils+bot) : <code>BotClient</code>
         * [.library](#Utils+library) : <code>LibraryInterface</code>
-        * [.splitMessage(content)](#Utils+splitMessage) ⇒ <code>Array.&lt;String&gt;</code> \| <code>String</code>
+        * [.splitMessage(content, [length])](#Utils+splitMessage) ⇒ <code>Array.&lt;String&gt;</code>
         * [.getPrefix(msg)](#Utils+getPrefix) ⇒ <code>Promise.&lt;String&gt;</code>
         * [.getRoles(guild, member)](#Utils+getRoles) ⇒ <code>Array.&lt;Role&gt;</code>
         * [.getHighestRole(guild, member)](#Utils+getHighestRole) ⇒ <code>Role</code>
@@ -89,16 +89,17 @@ Returns the LibraryInterface instance
 **Read only**: true  
 <a name="Utils+splitMessage"></a>
 
-### utils.splitMessage(content) ⇒ <code>Array.&lt;String&gt;</code> \| <code>String</code>
+### utils.splitMessage(content, [length]) ⇒ <code>Array.&lt;String&gt;</code>
 Split the given content (String), according to correct linebreaks.
-Split at 1900 characters.
+Split at default 1900 characters.
 
 **Kind**: instance method of [<code>Utils</code>](#Utils)  
-**Returns**: <code>Array.&lt;String&gt;</code> \| <code>String</code> - The array of content string splitted or the original String  
+**Returns**: <code>Array.&lt;String&gt;</code> - The array of content string splitted  
 
 | Param | Type |
 | --- | --- |
 | content | <code>String</code> | 
+| [length] | <code>Number</code> | 
 
 <a name="Utils+getPrefix"></a>