diff --git a/composer.json b/composer.json
index 8d0945d..d4a799c 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "php": "^8.2|^8.3|^8.4",
         "illuminate/contracts": "^11.43|^12.0",
         "laravel/pint": "^1.21",
-        "laravel/prompts": "^0.1.16|^0.2|^0.3.1",
+        "laravel/prompts": "^0.3.1",
         "lorisleiva/lody": "^0.6",
         "spatie/laravel-package-tools": "^1.19.0",
         "symfony/var-exporter": "^6|^7.1"
@@ -33,8 +33,8 @@
         "pestphp/pest": "^3.0",
         "pestphp/pest-plugin-laravel": "^3.0",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
-        "phpstan/phpstan-phpunit": "^1.0|^2.0",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
         "spatie/laravel-data": "^4.11.1",
         "lorisleiva/laravel-actions": "^2.9.0"
     },
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index a91953b..260b5e1 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -10,5 +10,4 @@ parameters:
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true
-    checkMissingIterableValueType: false
 
diff --git a/src/Commands/Concerns/HandleHooks.php b/src/Commands/Concerns/HandleHooks.php
index 9a1ed27..42c8ff2 100644
--- a/src/Commands/Concerns/HandleHooks.php
+++ b/src/Commands/Concerns/HandleHooks.php
@@ -14,6 +14,11 @@ protected function afterHandle()
         //
     }
 
+    /**
+     * Handle the command, with before and after hooks.
+     * 
+     * @return bool|null
+     */
     public function handle()
     {
         $this->beforeHandle();
@@ -21,5 +26,7 @@ public function handle()
         parent::handle();
 
         $this->afterHandle();
+
+        return true;
     }
 }
diff --git a/src/Commands/Concerns/UpdatesComposer.php b/src/Commands/Concerns/UpdatesComposer.php
deleted file mode 100644
index 6f094de..0000000
--- a/src/Commands/Concerns/UpdatesComposer.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Lunarstorm\LaravelDDD\Commands\Concerns;
-
-use Symfony\Component\Process\Process;
-
-trait UpdatesComposer
-{
-    public function fillComposerValue($path, $value)
-    {
-        $composerFile = base_path('composer.json');
-        $data = json_decode(file_get_contents($composerFile), true);
-        data_fill($data, $path, $value);
-
-        file_put_contents($composerFile, json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
-
-        return $this;
-    }
-
-    public function registerPsr4Autoload($namespace, $path)
-    {
-        $namespace = str($namespace)
-            ->rtrim('/\\')
-            ->finish('\\')
-            ->toString();
-
-        $this->comment("Registering `{$namespace}`:`{$path}` in composer.json...");
-
-        $this->fillComposerValue(['autoload', 'psr-4', $namespace], $path);
-
-        $this->composerReload();
-
-        return $this;
-    }
-
-    protected function composerReload()
-    {
-        $composer = $this->hasOption('composer') ? $this->option('composer') : 'global';
-
-        if ($composer !== 'global') {
-            $command = ['php', $composer, 'dump-autoload'];
-        } else {
-            $command = ['composer', 'dump-autoload'];
-        }
-
-        (new Process($command, base_path(), ['COMPOSER_MEMORY_LIMIT' => '-1']))
-            ->setTimeout(null)
-            ->run(function ($type, $output) {
-                $this->output->write($output);
-            });
-
-        return $this;
-    }
-}
diff --git a/src/Commands/ConfigCommand.php b/src/Commands/ConfigCommand.php
index c352e72..2faaf74 100644
--- a/src/Commands/ConfigCommand.php
+++ b/src/Commands/ConfigCommand.php
@@ -105,8 +105,7 @@ protected function layers()
 
     public static function hasRequiredVersionOfLaravelPrompts(): bool
     {
-        return function_exists('\Laravel\Prompts\form')
-            && method_exists(\Laravel\Prompts\FormBuilder::class, 'addIf');
+        return function_exists('\Laravel\Prompts\form');
     }
 
     protected function wizard(): int
diff --git a/src/Commands/DomainViewModelMakeCommand.php b/src/Commands/DomainViewModelMakeCommand.php
index e75700b..b29ae24 100644
--- a/src/Commands/DomainViewModelMakeCommand.php
+++ b/src/Commands/DomainViewModelMakeCommand.php
@@ -65,7 +65,7 @@ public function handle()
             ]);
         }
 
-        parent::handle();
+        return parent::handle();
     }
 
     protected function shouldCreateBaseViewModel(): bool
diff --git a/src/LaravelDDDServiceProvider.php b/src/LaravelDDDServiceProvider.php
index cb3965e..1d1ea2a 100644
--- a/src/LaravelDDDServiceProvider.php
+++ b/src/LaravelDDDServiceProvider.php
@@ -42,8 +42,11 @@ public function configurePackage(Package $package): void
                 Commands\DomainChannelMakeCommand::class,
                 Commands\DomainConsoleMakeCommand::class,
                 Commands\DomainControllerMakeCommand::class,
+                Commands\DomainClassMakeCommand::class,
+                Commands\DomainEnumMakeCommand::class,
                 Commands\DomainEventMakeCommand::class,
                 Commands\DomainExceptionMakeCommand::class,
+                Commands\DomainInterfaceMakeCommand::class,
                 Commands\DomainJobMakeCommand::class,
                 Commands\DomainListenerMakeCommand::class,
                 Commands\DomainMailMakeCommand::class,
@@ -57,16 +60,10 @@ public function configurePackage(Package $package): void
                 Commands\DomainRuleMakeCommand::class,
                 Commands\DomainScopeMakeCommand::class,
                 Commands\DomainSeederMakeCommand::class,
+                Commands\DomainTraitMakeCommand::class,
                 Commands\Migration\DomainMigrateMakeCommand::class,
             ]);
 
-        if ($this->laravelVersion(11)) {
-            $package->hasCommand(Commands\DomainClassMakeCommand::class);
-            $package->hasCommand(Commands\DomainEnumMakeCommand::class);
-            $package->hasCommand(Commands\DomainInterfaceMakeCommand::class);
-            $package->hasCommand(Commands\DomainTraitMakeCommand::class);
-        }
-
         if ($this->app->runningUnitTests()) {
             $package->hasRoutes(['testing']);
         }
@@ -135,7 +132,7 @@ public function packageBooted()
     {
         Autoload::run();
 
-        if ($this->app->runningInConsole() && method_exists($this, 'optimizes')) {
+        if ($this->app->runningInConsole()) {
             $this->optimizes(
                 optimize: 'ddd:optimize',
                 clear: 'ddd:clear',
diff --git a/src/Support/Concerns/InteractsWithComposer.php b/src/Support/Concerns/InteractsWithComposer.php
deleted file mode 100644
index cc1bbee..0000000
--- a/src/Support/Concerns/InteractsWithComposer.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Lunarstorm\LaravelDDD\Support\Concerns;
-
-trait InteractsWithComposer
-{
-    public function composerFill($path, $value)
-    {
-        $composerFile = base_path('composer.json');
-        $data = json_decode(file_get_contents($composerFile), true);
-
-        data_fill($data, $path, $value);
-
-        file_put_contents($composerFile, json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
-
-        return $this;
-    }
-
-    public function composerRegisterAutoload($namespace, $path)
-    {
-        $namespace = str($namespace)
-            ->rtrim('/\\')
-            ->finish('\\')
-            ->toString();
-
-        $this->composerFill(['autoload', 'psr-4', $namespace], $path);
-
-        return $this;
-    }
-}