diff --git a/docs/navigation.php b/docs/navigation.php
index 064cd9a..9ad2bfa 100644
--- a/docs/navigation.php
+++ b/docs/navigation.php
@@ -78,7 +78,7 @@ return [
             'children' => [
                 'Tenants'                    => 'tenants',
                 'Central App'                => 'central-app',
-                'Middleware Configuration'   => 'middleware-configuration',
+                'Universal Routes'           => 'universal-routes',
                 'Custom Database Names'      => 'custom-database-names',
                 'Custom DB Connections'      => 'custom-db-connections',
                 'Filesystem Tenancy'         => 'filesystem-tenancy',
@@ -87,6 +87,8 @@ return [
                 'Tenancy Initialization'     => 'tenancy-initialization',
                 'Tenancy Bootstrappers'      => 'tenancy-bootstrappers',
                 'Application Testing'        => 'application-testing',
+                'Tenant-Aware Commands'      => 'tenant-aware-commands',
+                'Middleware Configuration'   => 'middleware-configuration',
                 'Writing Storage Drivers'    => 'writing-storage-drivers',
             ],
         ],
diff --git a/docs/source/v2/tenant-aware-commands.blade.md b/docs/source/v2/tenant-aware-commands.blade.md
new file mode 100644
index 0000000..3f12d35
--- /dev/null
+++ b/docs/source/v2/tenant-aware-commands.blade.md
@@ -0,0 +1,61 @@
+---
+title: Tenant-Aware Commands
+description: Tenant-Aware Commands
+extends: _layouts.documentation
+section: content
+---
+
+# Tenant-Aware Commands {#tenant-aware-commands}
+
+Even though [`tenants:run`]({{ $page->link('console-commands#run') }}) lets you run arbitrary artisan commands for tenants, you may want to have strictly tenant commands.
+
+To make a command tenant-aware, utilize the `TenantAwareCommand` trait:
+```php
+class MyCommand extends Command
+{
+    use TenantAwareCommand;
+}
+```
+
+However, this trait requires you to implement a `getTenants()` method that returns an array of `Tenant` instances.
+
+If you don't want to implement the options/arguments yourself, you may use one of these two traits:
+- `HasATenantsOption` - accepts multiple tenant ids, optional -- by default the command is executed for all tenants
+- `HasATenantArgument` - accepts a single tenant id, required argument
+
+These traits implement the `getTenants()` method needed by `TenantAwareCommand`.
+
+> Note: If you're using a custom constructor for your command, you need to add `$this->specifyParameters()` at the end for the option/argument traits to take effect.
+
+So if you use these traits in combination with `TenantAwareCommand`, you won't have to change a thing in your command:
+
+```php
+class FooCommand extends Command
+{
+    use TenantAwareCommand, HasATenantsOption;
+
+    public function handle()
+    {
+        //
+    }
+}
+
+class BarCommand extends Command
+{
+    use TenantAwareCommand, HasATenantArgument;
+
+    public function handle()
+    {
+        //
+    }
+}
+```
+
+### Custom implementation
+
+If you want more control, you may implement this functionality yourself by simply accepting a `tenant_id` argument and then inside `handle()` doing something like this:
+```php
+tenancy()->find($this->argument('tenant_id'))->run(function () {
+    // your actual command code
+});
+```