diff --git a/bin/cli b/bin/cli
index 8a2983c1..e400bef8 100755
--- a/bin/cli
+++ b/bin/cli
@@ -1,16 +1,10 @@
 #!/usr/bin/env php
 <?php
-use Acelaya\UrlShortener\CliCommands\GenerateShortcodeCommand;
-use Acelaya\UrlShortener\CliCommands\ResolveUrlCommand;
 use Interop\Container\ContainerInterface;
 use Symfony\Component\Console\Application as CliApp;
 
 /** @var ContainerInterface $container */
 $container = include __DIR__ . '/../config/container.php';
 
-$app = new CliApp();
-$app->addCommands([
-    $container->get(GenerateShortcodeCommand::class),
-    $container->get(ResolveUrlCommand::class),
-]);
+$app = $container->get(CliApp::class);
 $app->run();
diff --git a/config/autoload/cli.global.php b/config/autoload/cli.global.php
new file mode 100644
index 00000000..f1a36b7d
--- /dev/null
+++ b/config/autoload/cli.global.php
@@ -0,0 +1,13 @@
+<?php
+use Acelaya\UrlShortener\CLI\Command;
+
+return [
+
+    'cli' => [
+        'commands' => [
+            Command\GenerateShortcodeCommand::class,
+            Command\ResolveUrlCommand::class,
+        ]
+    ],
+
+];
diff --git a/config/autoload/services.global.php b/config/autoload/services.global.php
index b3103ac3..9f4447f4 100644
--- a/config/autoload/services.global.php
+++ b/config/autoload/services.global.php
@@ -1,5 +1,5 @@
 <?php
-use Acelaya\UrlShortener\CliCommands;
+use Acelaya\UrlShortener\CLI;
 use Acelaya\UrlShortener\Factory\CacheFactory;
 use Acelaya\UrlShortener\Factory\EntityManagerFactory;
 use Acelaya\UrlShortener\Middleware;
@@ -7,7 +7,8 @@ use Acelaya\UrlShortener\Service;
 use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
 use Doctrine\Common\Cache\Cache;
 use Doctrine\ORM\EntityManager;
-use Zend\Expressive\Application;
+use Symfony\Component\Console;
+use Zend\Expressive;
 use Zend\Expressive\Container;
 use Zend\Expressive\Helper;
 use Zend\Expressive\Router;
@@ -19,7 +20,8 @@ return [
 
     'services' => [
         'factories' => [
-            Application::class => Container\ApplicationFactory::class,
+            Expressive\Application::class => Container\ApplicationFactory::class,
+            Console\Application::class => CLI\Factory\ApplicationFactory::class,
 
             // Url helpers
             Helper\UrlHelper::class => Helper\UrlHelperFactory::class,
@@ -42,8 +44,8 @@ return [
             Cache::class => CacheFactory::class,
 
             // Cli commands
-            CliCommands\GenerateShortcodeCommand::class => AnnotatedFactory::class,
-            CliCommands\ResolveUrlCommand::class => AnnotatedFactory::class,
+            CLI\Command\GenerateShortcodeCommand::class => AnnotatedFactory::class,
+            CLI\Command\ResolveUrlCommand::class => AnnotatedFactory::class,
 
             // Middleware
             Middleware\Routable\RedirectMiddleware::class => AnnotatedFactory::class,
diff --git a/src/CliCommands/GenerateShortcodeCommand.php b/src/CLI/Command/GenerateShortcodeCommand.php
similarity index 98%
rename from src/CliCommands/GenerateShortcodeCommand.php
rename to src/CLI/Command/GenerateShortcodeCommand.php
index 68b076c3..ea6fc929 100644
--- a/src/CliCommands/GenerateShortcodeCommand.php
+++ b/src/CLI/Command/GenerateShortcodeCommand.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\CliCommands;
+namespace Acelaya\UrlShortener\CLI\Command;
 
 use Acelaya\UrlShortener\Exception\InvalidUrlException;
 use Acelaya\UrlShortener\Service\UrlShortener;
diff --git a/src/CliCommands/ResolveUrlCommand.php b/src/CLI/Command/ResolveUrlCommand.php
similarity index 98%
rename from src/CliCommands/ResolveUrlCommand.php
rename to src/CLI/Command/ResolveUrlCommand.php
index e10cd73e..73b330d9 100644
--- a/src/CliCommands/ResolveUrlCommand.php
+++ b/src/CLI/Command/ResolveUrlCommand.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\CliCommands;
+namespace Acelaya\UrlShortener\CLI\Command;
 
 use Acelaya\UrlShortener\Exception\InvalidShortCodeException;
 use Acelaya\UrlShortener\Service\UrlShortener;
diff --git a/src/CLI/Factory/ApplicationFactory.php b/src/CLI/Factory/ApplicationFactory.php
new file mode 100644
index 00000000..d44150d1
--- /dev/null
+++ b/src/CLI/Factory/ApplicationFactory.php
@@ -0,0 +1,41 @@
+<?php
+namespace Acelaya\UrlShortener\CLI\Factory;
+
+use Interop\Container\ContainerInterface;
+use Interop\Container\Exception\ContainerException;
+use Symfony\Component\Console\Application as CliApp;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Zend\ServiceManager\Factory\FactoryInterface;
+
+class ApplicationFactory implements FactoryInterface
+{
+    /**
+     * Create an object
+     *
+     * @param  ContainerInterface $container
+     * @param  string $requestedName
+     * @param  null|array $options
+     * @return object
+     * @throws ServiceNotFoundException if unable to resolve the service.
+     * @throws ServiceNotCreatedException if an exception is raised when
+     *     creating a service.
+     * @throws ContainerException if any other error occurs
+     */
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    {
+        $config = $container->get('config')['cli'];
+        $app = new CliApp();
+
+        $commands = isset($config['commands']) ? $config['commands'] : [];
+        foreach ($commands as $command) {
+            if (! $container->has($command)) {
+                continue;
+            }
+
+            $app->add($container->get($command));
+        }
+
+        return $app;
+    }
+}