diff --git a/application/Espo/Core/Console/Commands/Upgrade.php b/application/Espo/Core/Console/Commands/Upgrade.php
index 8219e729c8..876506ce89 100644
--- a/application/Espo/Core/Console/Commands/Upgrade.php
+++ b/application/Espo/Core/Console/Commands/Upgrade.php
@@ -31,7 +31,9 @@ namespace Espo\Core\Console\Commands;
 
 use Espo\Core\Exceptions\Error;
 
-class Upgrade extends Base
+use Espo\Core\Container;
+
+class Upgrade implements Command
 {
     protected $upgradeManager;
 
@@ -48,7 +50,19 @@ class Upgrade extends Base
         'rebuild',
     ];
 
-    public function run($options, $flagList, $argumentList)
+    private $container;
+
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
+
+    protected function getContainer()
+    {
+        return $this->container;
+    }
+
+    public function run(array $options, array $flagList, array $argumentList)
     {
         $params = $this->normalizeParams($options, $flagList, $argumentList);
 
diff --git a/application/Espo/Core/Console/Commands/UpgradeStep.php b/application/Espo/Core/Console/Commands/UpgradeStep.php
index 6b04657db9..f4715a269c 100644
--- a/application/Espo/Core/Console/Commands/UpgradeStep.php
+++ b/application/Espo/Core/Console/Commands/UpgradeStep.php
@@ -29,9 +29,23 @@
 
 namespace Espo\Core\Console\Commands;
 
-class UpgradeStep extends Base
+use Espo\Core\Container;
+
+class UpgradeStep implements Command
 {
-    public function run($options, $flagList, $argumentList)
+    private $container;
+
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
+
+    protected function getContainer()
+    {
+        return $this->container;
+    }
+
+    public function run(array $options)
     {
         if (empty($options['step'])) {
             echo "Step is not specified.\n";