diff --git a/src/voku/SimplePhpParser/Model/PHPClass.php b/src/voku/SimplePhpParser/Model/PHPClass.php
index 9246244..b81d530 100644
--- a/src/voku/SimplePhpParser/Model/PHPClass.php
+++ b/src/voku/SimplePhpParser/Model/PHPClass.php
@@ -7,6 +7,7 @@
 use PhpParser\Comment\Doc;
 use PhpParser\Node\Stmt\Class_;
 use ReflectionClass;
+use voku\SimplePhpParser\Parsers\Helper\DocFactoryProvider;
 use voku\SimplePhpParser\Parsers\Helper\Utils;
 
 class PHPClass extends BasePHPClass
@@ -385,7 +386,7 @@ private function readPhpDocProperties($doc): void
         }
 
         try {
-            $phpDoc = Utils::createDocBlockInstance()->create($docComment);
+            $phpDoc = DocFactoryProvider::getDocFactory()->create($docComment);
 
             $parsedPropertyTags = $phpDoc->getTagsByName('property')
                                + $phpDoc->getTagsByName('property-read')
diff --git a/src/voku/SimplePhpParser/Model/PHPFunction.php b/src/voku/SimplePhpParser/Model/PHPFunction.php
index d907c3c..b58a555 100644
--- a/src/voku/SimplePhpParser/Model/PHPFunction.php
+++ b/src/voku/SimplePhpParser/Model/PHPFunction.php
@@ -76,7 +76,7 @@ public function readObjectFromPhpNode($node, $dummy = null): self
         $docComment = $node->getDocComment();
         if ($docComment) {
             try {
-                $phpDoc = Utils::createDocBlockInstance()->create($docComment->getText());
+                $phpDoc = DocFactoryProvider::getDocFactory()->create($docComment->getText());
                 $this->summary = $phpDoc->getSummary();
                 $this->description = (string) $phpDoc->getDescription();
             } catch (\Exception $e) {
@@ -229,7 +229,7 @@ protected function readPhpDoc($doc): void
         }
 
         try {
-            $phpDoc = Utils::createDocBlockInstance()->create($docComment);
+            $phpDoc = DocFactoryProvider::getDocFactory()->create($docComment);
 
             $parsedReturnTag = $phpDoc->getTagsByName('return');
 
diff --git a/src/voku/SimplePhpParser/Model/PHPMethod.php b/src/voku/SimplePhpParser/Model/PHPMethod.php
index 182c05d..0411ae8 100644
--- a/src/voku/SimplePhpParser/Model/PHPMethod.php
+++ b/src/voku/SimplePhpParser/Model/PHPMethod.php
@@ -44,7 +44,7 @@ public function readObjectFromPhpNode($node, $classStr = null): PHPFunction
         $docComment = $node->getDocComment();
         if ($docComment) {
             try {
-                $phpDoc = Utils::createDocBlockInstance()->create($docComment->getText());
+                $phpDoc = DocFactoryProvider::getDocFactory()->create($docComment->getText());
                 $this->summary = $phpDoc->getSummary();
                 $this->description = (string) $phpDoc->getDescription();
             } catch (\Exception $e) {
diff --git a/src/voku/SimplePhpParser/Model/PHPParameter.php b/src/voku/SimplePhpParser/Model/PHPParameter.php
index 2175cdf..9324492 100644
--- a/src/voku/SimplePhpParser/Model/PHPParameter.php
+++ b/src/voku/SimplePhpParser/Model/PHPParameter.php
@@ -221,7 +221,6 @@ private function readPhpDoc($doc, string $parameterName): void
 
         try {
             $phpDoc = Utils::createDocBlockInstance()->create($docComment);
-
             $parsedParamTags = $phpDoc->getTagsByName('param');
 
             if (!empty($parsedParamTags)) {
diff --git a/src/voku/SimplePhpParser/Model/PHPProperty.php b/src/voku/SimplePhpParser/Model/PHPProperty.php
index 5f90f20..c651e27 100644
--- a/src/voku/SimplePhpParser/Model/PHPProperty.php
+++ b/src/voku/SimplePhpParser/Model/PHPProperty.php
@@ -7,6 +7,7 @@
 use PhpParser\Comment\Doc;
 use PhpParser\Node\Stmt\Property;
 use ReflectionProperty;
+use voku\SimplePhpParser\Parsers\Helper\DocFactoryProvider;
 use voku\SimplePhpParser\Parsers\Helper\Utils;
 
 class PHPProperty extends BasePHPElement
@@ -229,7 +230,7 @@ private function readPhpDoc($doc): void
         }
 
         try {
-            $phpDoc = Utils::createDocBlockInstance()->create($docComment);
+            $phpDoc = DocFactoryProvider::getDocFactory()->create($docComment);
 
             $parsedParamTags = $phpDoc->getTagsByName('var');
 
diff --git a/src/voku/SimplePhpParser/Model/PHPTrait.php b/src/voku/SimplePhpParser/Model/PHPTrait.php
index 7335437..c4ba4c8 100644
--- a/src/voku/SimplePhpParser/Model/PHPTrait.php
+++ b/src/voku/SimplePhpParser/Model/PHPTrait.php
@@ -7,6 +7,7 @@
 use PhpParser\Comment\Doc;
 use PhpParser\Node\Stmt\Trait_;
 use ReflectionClass;
+use voku\SimplePhpParser\Parsers\Helper\DocFactoryProvider;
 use voku\SimplePhpParser\Parsers\Helper\Utils;
 
 final class PHPTrait extends BasePHPClass
@@ -292,7 +293,7 @@ private function readPhpDocProperties($doc): void
         }
 
         try {
-            $phpDoc = Utils::createDocBlockInstance()->create($docComment);
+            $phpDoc = DocFactoryProvider::getDocFactory()->create($docComment);
 
             $parsedPropertyTags = $phpDoc->getTagsByName('property')
                                + $phpDoc->getTagsByName('property-read')