diff --git a/config/services.yaml b/config/services.yaml
index 9873c17..48126f2 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -30,6 +30,11 @@ services:
         tags:
             - { name: maker.command }
 
+    GeekCell\DddBundle\Maker\MakeCommand:
+        class: GeekCell\DddBundle\Maker\MakeCommand
+        tags:
+            - { name: maker.command }
+
     GeekCell\DddBundle\Maker\Doctrine\DoctrineConfigUpdater:
         class: GeekCell\DddBundle\Maker\Doctrine\DoctrineConfigUpdater
         public: false
diff --git a/src/Maker/AbstractBaseMakeQueryCommand.php b/src/Maker/AbstractBaseMakeQueryCommand.php
new file mode 100644
index 0000000..44767dd
--- /dev/null
+++ b/src/Maker/AbstractBaseMakeQueryCommand.php
@@ -0,0 +1,148 @@
+<?php
+
+declare(strict_types=1);
+
+namespace GeekCell\DddBundle\Maker;
+
+use Symfony\Bundle\MakerBundle\InputConfiguration;
+use Symfony\Bundle\MakerBundle\DependencyBuilder;
+use Symfony\Bundle\MakerBundle\ConsoleStyle;
+use Symfony\Bundle\MakerBundle\Generator;
+use Symfony\Bundle\MakerBundle\InputAwareMakerInterface;
+use Symfony\Bundle\MakerBundle\Maker\AbstractMaker;
+use Symfony\Bundle\MakerBundle\Util\ClassNameDetails;
+use Symfony\Bundle\MakerBundle\Util\UseStatementGenerator;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+
+abstract class AbstractBaseMakeQueryCommand extends AbstractMaker implements InputAwareMakerInterface
+{
+    /**
+     * Should return the target for the extending command (query|command)
+     * @return string
+     */
+    abstract function getTarget(): string;
+
+    /**
+     * Should return an array of classes to import when generating the entity
+     * @return string[]
+     */
+    abstract function getEntityUseStatements(): array;
+
+    /**
+     * Should return an array of classes to import when generating the entity handler
+     * @return string[]
+     */
+    abstract function getEntityHandlerUseStatements(): array;
+
+    /**
+     * @return string
+     */
+    function getClassSuffix(): string
+    {
+        return ucfirst($this->getTarget());
+    }
+
+    /**
+     * @return string
+     */
+    function getNamespacePrefix(): string
+    {
+        return 'Application\\' . $this->getClassSuffix() . '\\';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function configureCommand(Command $command, InputConfiguration $inputConfig): void
+    {
+        $command
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'The name of the ' . $this->getTarget() . ' class (e.g. <fg=yellow>Customer</>)',
+            )
+        ;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function configureDependencies(DependencyBuilder $dependencies, InputInterface $input = null): void
+    {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function interact(InputInterface $input, ConsoleStyle $io, Command $command): void
+    {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator): void
+    {
+        $entityClassNameDetails = $generator->createClassNameDetails(
+            $input->getArgument('name'),
+            $this->getNamespacePrefix(),
+            $this->getClassSuffix(),
+        );
+
+        $this->generateEntity($entityClassNameDetails, $generator);
+        $this->generateHandler($entityClassNameDetails, $generator);
+
+        $this->writeSuccessMessage($io);
+    }
+
+    /**
+     * @param ClassNameDetails $queryClassNameDetails
+     * @param Generator $generator
+     * @return void
+     */
+    private function generateEntity(ClassNameDetails $queryClassNameDetails, Generator $generator): void
+    {
+        $templateVars = [
+            'use_statements' => new UseStatementGenerator($this->getEntityUseStatements()),
+        ];
+
+        $templatePath = __DIR__."/../Resources/skeleton/{$this->getTarget()}/{$this->getClassSuffix()}.tpl.php";
+        $generator->generateClass(
+            $queryClassNameDetails->getFullName(),
+            $templatePath,
+            $templateVars,
+        );
+
+        $generator->writeChanges();
+    }
+
+    /**
+     * @param ClassNameDetails $queryClassNameDetails
+     * @param Generator $generator
+     * @return void
+     */
+    private function generateHandler(ClassNameDetails $queryClassNameDetails, Generator $generator): void
+    {
+        $classNameDetails = $generator->createClassNameDetails(
+            $queryClassNameDetails->getShortName(),
+            $this->getNamespacePrefix(),
+            'Handler',
+        );
+
+        $templateVars = [
+            'use_statements' => new UseStatementGenerator($this->getEntityHandlerUseStatements()),
+            'query_class_name' => $queryClassNameDetails->getShortName()
+        ];
+
+        $templatePath = __DIR__."/../Resources/skeleton/{$this->getTarget()}/{$this->getClassSuffix()}Handler.tpl.php";
+        $generator->generateClass(
+            $classNameDetails->getFullName(),
+            $templatePath,
+            $templateVars,
+        );
+
+        $generator->writeChanges();
+    }
+}
diff --git a/src/Maker/MakeCommand.php b/src/Maker/MakeCommand.php
new file mode 100644
index 0000000..bdaa81f
--- /dev/null
+++ b/src/Maker/MakeCommand.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace GeekCell\DddBundle\Maker;
+
+use GeekCell\Ddd\Contracts\Application\Command;
+use GeekCell\Ddd\Contracts\Application\CommandHandler;
+use GeekCell\Ddd\Domain\Collection;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+
+final class MakeCommand extends AbstractBaseMakeQueryCommand
+{
+    const TARGET = 'command';
+
+    /**
+     * @inheritDoc
+     */
+    public static function getCommandName(): string
+    {
+        return 'make:ddd:' . self::TARGET;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getCommandDescription(): string
+    {
+        return 'Creates a new ' . self::TARGET . ' class and handler';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    function getTarget(): string
+    {
+        return self::TARGET;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    function getEntityUseStatements(): array
+    {
+        return [
+            Command::class
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    function getEntityHandlerUseStatements(): array
+    {
+        return [
+            CommandHandler::class,
+            AsMessageHandler::class
+        ];
+    }
+}
diff --git a/src/Maker/MakeQuery.php b/src/Maker/MakeQuery.php
index 1e41f30..97e9b6d 100644
--- a/src/Maker/MakeQuery.php
+++ b/src/Maker/MakeQuery.php
@@ -7,31 +7,18 @@
 use GeekCell\Ddd\Contracts\Application\Query;
 use GeekCell\Ddd\Contracts\Application\QueryHandler;
 use GeekCell\Ddd\Domain\Collection;
-use Symfony\Bundle\MakerBundle\InputConfiguration;
-use Symfony\Bundle\MakerBundle\DependencyBuilder;
-use Symfony\Bundle\MakerBundle\ConsoleStyle;
-use Symfony\Bundle\MakerBundle\Generator;
-use Symfony\Bundle\MakerBundle\InputAwareMakerInterface;
-use Symfony\Bundle\MakerBundle\Maker\AbstractMaker;
-use Symfony\Bundle\MakerBundle\Util\ClassNameDetails;
-use Symfony\Bundle\MakerBundle\Util\UseStatementGenerator;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
-const NAMESPACE_PREFIX = 'Application\\Query\\';
-
-final class MakeQuery extends AbstractMaker implements InputAwareMakerInterface
+final class MakeQuery extends AbstractBaseMakeQueryCommand
 {
-    public function __construct() {}
+    const TARGET = 'query';
 
     /**
      * @inheritDoc
      */
     public static function getCommandName(): string
     {
-        return 'make:ddd:query';
+        return 'make:ddd:' . self::TARGET;
     }
 
     /**
@@ -39,106 +26,36 @@ public static function getCommandName(): string
      */
     public static function getCommandDescription(): string
     {
-        return 'Creates a new query class and handler';
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function configureCommand(Command $command, InputConfiguration $inputConfig): void
-    {
-        $command
-            ->addArgument(
-                'name',
-                InputArgument::REQUIRED,
-                'The name of the query class (e.g. <fg=yellow>Customer</>)',
-            )
-        ;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function configureDependencies(DependencyBuilder $dependencies, InputInterface $input = null): void
-    {
+        return 'Creates a new ' . self::TARGET . ' class and handler';
     }
 
     /**
      * @inheritDoc
      */
-    public function interact(InputInterface $input, ConsoleStyle $io, Command $command): void
+    function getTarget(): string
     {
+        return self::TARGET;
     }
 
     /**
      * @inheritDoc
      */
-    public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator): void
+    function getEntityUseStatements(): array
     {
-        $queryClassNameDetails = $generator->createClassNameDetails(
-            $input->getArgument('name'),
-            NAMESPACE_PREFIX,
-            'Query',
-        );
-
-        $this->generateQuery($queryClassNameDetails, $generator);
-        $this->generateQueryHandler($queryClassNameDetails, $generator);
-
-        $this->writeSuccessMessage($io);
-    }
-
-    /**
-     * @param ClassNameDetails $queryClassNameDetails
-     * @param Generator $generator
-     * @return void
-     */
-    private function generateQuery(ClassNameDetails $queryClassNameDetails, Generator $generator): void
-    {
-        $templateVars = [
-            'use_statements' => new UseStatementGenerator([
-                Query::class,
-            ]),
+        return [
+            Query::class
         ];
-
-        $templatePath = __DIR__.'/../Resources/skeleton/query/Query.tpl.php';
-        $generator->generateClass(
-            $queryClassNameDetails->getFullName(),
-            $templatePath,
-            $templateVars,
-        );
-
-        $generator->writeChanges();
     }
 
     /**
-     * @param ClassNameDetails $queryClassNameDetails
-     * @param Generator $generator
-     * @return void
+     * @inheritDoc
      */
-    private function generateQueryHandler(ClassNameDetails $queryClassNameDetails, Generator $generator): void
+    function getEntityHandlerUseStatements(): array
     {
-        $classNameDetails = $generator->createClassNameDetails(
-            $queryClassNameDetails->getShortName(),
-            NAMESPACE_PREFIX,
-            'Handler',
-        );
-
-        $templateVars = [
-            'use_statements' => new UseStatementGenerator([
-                QueryHandler::class,
-                Collection::class,
-                AsMessageHandler::class
-            ]),
-            'query_class_name' => $queryClassNameDetails->getShortName()
+        return [
+            QueryHandler::class,
+            Collection::class,
+            AsMessageHandler::class
         ];
-
-        $templatePath = __DIR__.'/../Resources/skeleton/query/QueryHandler.tpl.php';
-        $generator->generateClass(
-            $classNameDetails->getFullName(),
-            $templatePath,
-            $templateVars,
-        );
-
-        $generator->writeChanges();
     }
 }
diff --git a/src/Resources/skeleton/command/Command.tpl.php b/src/Resources/skeleton/command/Command.tpl.php
new file mode 100644
index 0000000..1ee97fe
--- /dev/null
+++ b/src/Resources/skeleton/command/Command.tpl.php
@@ -0,0 +1,9 @@
+<?= "<?php\n" ?>
+
+namespace <?= $namespace; ?>;
+
+<?= $use_statements ?>
+
+class <?= $class_name ?> implements Command
+{
+}
diff --git a/src/Resources/skeleton/command/CommandHandler.tpl.php b/src/Resources/skeleton/command/CommandHandler.tpl.php
new file mode 100644
index 0000000..eed3eed
--- /dev/null
+++ b/src/Resources/skeleton/command/CommandHandler.tpl.php
@@ -0,0 +1,13 @@
+<?= "<?php\n" ?>
+
+namespace <?= $namespace; ?>;
+
+<?= $use_statements ?>
+
+#[AsMessageHandler]
+class <?= $class_name ?> implements CommandHandler
+{
+    public function __invoke(<?= $query_class_name ?> $query): void
+    {
+    }
+}