diff --git a/src/MessageBus/CommandBusDynamicMethodThrowTypeExtension.php b/src/MessageBus/CommandBusDynamicMethodThrowTypeExtension.php
index fd1bf54..df1a89a 100644
--- a/src/MessageBus/CommandBusDynamicMethodThrowTypeExtension.php
+++ b/src/MessageBus/CommandBusDynamicMethodThrowTypeExtension.php
@@ -64,7 +64,7 @@ public function getThrowTypeFromMethodCall(MethodReflection $methodReflection, M
     }
 
     /**
-     * @return Type[]
+     * @return list<Type>
      */
     private function getHandlerThrowTypes(string $commandType, Scope $scope): array
     {
diff --git a/src/MessageBus/CommandHandlerResolver.php b/src/MessageBus/CommandHandlerResolver.php
index 4cf202f..9d013e0 100644
--- a/src/MessageBus/CommandHandlerResolver.php
+++ b/src/MessageBus/CommandHandlerResolver.php
@@ -14,19 +14,19 @@ class CommandHandlerResolver
 {
 
     /**
-     * @var string[]
+     * @var array<string>
      */
     private array $scanDirectories;
 
     /**
-     * @var string[]|null
+     * @var array<class-string<CommandHandler>, class-string>|null
      */
     private ?array $commandTypeByHandlerType = null;
 
     private MessageTypeExtractor $messageTypeExtractor;
 
     /**
-     * @param string[] $scanDirectories
+     * @param array<string> $scanDirectories
      */
     public function __construct(array $scanDirectories, MessageTypeExtractor $messageTypeExtractor)
     {
@@ -35,7 +35,7 @@ public function __construct(array $scanDirectories, MessageTypeExtractor $messag
     }
 
     /**
-     * @return string[]
+     * @return list<string>
      */
     public function getHandlerClasses(string $handledCommandType): array
     {
@@ -50,7 +50,7 @@ public function getHandlerClasses(string $handledCommandType): array
     }
 
     /**
-     * @return string[]
+     * @return array<class-string<CommandHandler>, class-string>
      */
     private function getCommandTypeByHandlerType(): array
     {
@@ -83,7 +83,7 @@ private function getCommandTypeByHandlerType(): array
     }
 
     /**
-     * @return string[]
+     * @return list<string>
      */
     private function getAllClasses(): array
     {
diff --git a/src/MessageBus/CommandTypeExtractor.php b/src/MessageBus/CommandTypeExtractor.php
index a685dc1..a6002c0 100644
--- a/src/MessageBus/CommandTypeExtractor.php
+++ b/src/MessageBus/CommandTypeExtractor.php
@@ -11,6 +11,9 @@
 class CommandTypeExtractor
 {
 
+    /**
+     * @return class-string|null
+     */
     public function extractCommandType(MethodCall $methodCall, Scope $scope): ?string
     {
         if (count($methodCall->args) === 0) {