diff --git a/src/Traits/HasATenantArgument.php b/src/Traits/HasATenantArgument.php
new file mode 100644
index 00000000..7ad0c846
--- /dev/null
+++ b/src/Traits/HasATenantArgument.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Traits;
+
+use Symfony\Component\Console\Input\InputArgument;
+
+trait HasATenantArgument
+{
+    protected function getArguments()
+    {
+        return array_merge([
+            ['tenant', InputArgument::REQUIRED, 'Tenant id', null],
+        ], parent::getArguments());
+    }
+
+    protected function getTenants(): array
+    {
+        return [tenancy()->find($this->argument('tenant'))];
+    }
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->specifyParameters();
+    }
+}
diff --git a/src/Traits/HasATenantOption.php b/src/Traits/HasATenantOption.php
deleted file mode 100644
index 650f6c2d..00000000
--- a/src/Traits/HasATenantOption.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Stancl\Tenancy\Traits;
-
-use Symfony\Component\Console\Input\InputOption;
-
-trait HasATenantOption
-{
-    protected function getOptions()
-    {
-        return array_merge([
-            ['tenant', null, InputOption::VALUE_REQUIRED, '', null],
-        ], parent::getOptions());
-    }
-
-    protected function getTenants(): array
-    {
-        return tenancy()->all($this->option('tenants'))->all();
-    }
-}
diff --git a/src/Traits/HasATenantsOption.php b/src/Traits/HasATenantsOption.php
index 1d1dad94..103a3b91 100644
--- a/src/Traits/HasATenantsOption.php
+++ b/src/Traits/HasATenantsOption.php
@@ -19,4 +19,11 @@ trait HasATenantsOption
     {
         return tenancy()->all($this->option('tenants'))->all();
     }
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->specifyParameters();
+    }
 }
diff --git a/src/Traits/TenantAwareCommand.php b/src/Traits/TenantAwareCommand.php
index b509e2f6..6cdb22e8 100644
--- a/src/Traits/TenantAwareCommand.php
+++ b/src/Traits/TenantAwareCommand.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Stancl\Tenancy\Traits;
+
 use Stancl\Tenancy\Tenant;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;