diff --git a/src/Internal/ConditionalLoaderTrait.php b/src/Internal/ConditionalLoaderTrait.php
index 04bd5a1..4bd8395 100644
--- a/src/Internal/ConditionalLoaderTrait.php
+++ b/src/Internal/ConditionalLoaderTrait.php
@@ -8,6 +8,9 @@
 use BenTools\ETL\Loader\ConditionalLoaderInterface;
 use BenTools\ETL\Loader\LoaderInterface;
 
+/**
+ * @internal
+ */
 trait ConditionalLoaderTrait
 {
     private static function shouldLoad(LoaderInterface $loader, mixed $item, EtlState $state): bool
diff --git a/src/Internal/DispatchEventsTrait.php b/src/Internal/DispatchEventsTrait.php
index 767f224..a547f7b 100644
--- a/src/Internal/DispatchEventsTrait.php
+++ b/src/Internal/DispatchEventsTrait.php
@@ -13,7 +13,7 @@
 /**
  * @internal
  *
- * @template A
+ * @template EtlExecutor
  */
 trait DispatchEventsTrait
 {
diff --git a/src/Internal/EtlBuilderTrait.php b/src/Internal/EtlBuilderTrait.php
index af50b16..31d98a1 100644
--- a/src/Internal/EtlBuilderTrait.php
+++ b/src/Internal/EtlBuilderTrait.php
@@ -5,6 +5,7 @@
 namespace BenTools\ETL\Internal;
 
 use BenTools\ETL\EtlConfiguration;
+use BenTools\ETL\EtlExecutor;
 use BenTools\ETL\Extractor\CallableExtractor;
 use BenTools\ETL\Extractor\ChainExtractor;
 use BenTools\ETL\Extractor\ExtractorInterface;
@@ -22,12 +23,12 @@
 /**
  * @internal
  *
- * @template T
+ * @template EtlExecutor
  */
 trait EtlBuilderTrait
 {
     /**
-     * @use EtlEventListenersTrait<T>
+     * @use EtlEventListenersTrait<EtlExecutor>
      */
     use EtlEventListenersTrait;
 
diff --git a/src/Internal/EtlEventListenersTrait.php b/src/Internal/EtlEventListenersTrait.php
index 312b470..a82c182 100644
--- a/src/Internal/EtlEventListenersTrait.php
+++ b/src/Internal/EtlEventListenersTrait.php
@@ -21,7 +21,7 @@
 /**
  * @internal
  *
- * @template T
+ * @template EtlExecutor
  */
 trait EtlEventListenersTrait
 {
diff --git a/src/Internal/StateHolder.php b/src/Internal/StateHolder.php
index ebae2af..5849f6c 100644
--- a/src/Internal/StateHolder.php
+++ b/src/Internal/StateHolder.php
@@ -6,6 +6,9 @@
 
 use BenTools\ETL\EtlState;
 
+/**
+ * @internal
+ */
 final class StateHolder
 {
     public function __construct(