diff --git a/src/Models/DataObject/ClassDefinitionServiceResolver.php b/src/Models/DataObject/ClassDefinitionServiceResolver.php
index ad41910..5c6250a 100644
--- a/src/Models/DataObject/ClassDefinitionServiceResolver.php
+++ b/src/Models/DataObject/ClassDefinitionServiceResolver.php
@@ -18,7 +18,6 @@
 
 use Pimcore\Bundle\StaticResolverBundle\Contract\Models\DataObject\ClassDefinitionServiceResolverContract;
 use Pimcore\Model\DataObject\ClassDefinition\Data;
-use Pimcore\Model\DataObject\ClassDefinition\Data\EncryptedField;
 use Pimcore\Model\DataObject\ClassDefinition\Layout;
 use Pimcore\Model\DataObject\ClassDefinition\Service;
 
@@ -31,7 +30,7 @@ public function generateLayoutTreeFromArray(
         array $array,
         bool $throwException = false,
         bool $insideLocalizedField = false
-    ): EncryptedField|bool|Data|Layout {
+    ): bool|Data|Layout {
         return Service::generateLayoutTreeFromArray($array, $throwException, $insideLocalizedField);
     }
 
diff --git a/src/Models/DataObject/ClassDefinitionServiceResolverInterface.php b/src/Models/DataObject/ClassDefinitionServiceResolverInterface.php
index d7e46e9..14676f7 100644
--- a/src/Models/DataObject/ClassDefinitionServiceResolverInterface.php
+++ b/src/Models/DataObject/ClassDefinitionServiceResolverInterface.php
@@ -19,7 +19,6 @@
 use Exception;
 use Pimcore\Bundle\StaticResolverBundle\Contract\Models\DataObject\ClassDefinitionServiceResolverContractInterface;
 use Pimcore\Model\DataObject\ClassDefinition\Data;
-use Pimcore\Model\DataObject\ClassDefinition\Data\EncryptedField;
 use Pimcore\Model\DataObject\ClassDefinition\Layout;
 
 /**
@@ -34,7 +33,7 @@ public function generateLayoutTreeFromArray(
         array $array,
         bool $throwException = false,
         bool $insideLocalizedField = false
-    ): EncryptedField|bool|Data|Layout;
+    ): bool|Data|Layout;
 
     public function setDoRemoveDynamicOptions(bool $doRemoveDynamicOptions): void;
 
diff --git a/src/Models/DataObject/ClassificationStore/ServiceResolver.php b/src/Models/DataObject/ClassificationStore/ServiceResolver.php
index 742828a..4646c2a 100644
--- a/src/Models/DataObject/ClassificationStore/ServiceResolver.php
+++ b/src/Models/DataObject/ClassificationStore/ServiceResolver.php
@@ -16,9 +16,7 @@
 
 namespace Pimcore\Bundle\StaticResolverBundle\Models\DataObject\ClassificationStore;
 
-use Exception;
 use Pimcore\Model\DataObject\ClassDefinition\Data;
-use Pimcore\Model\DataObject\ClassDefinition\Data\EncryptedField;
 use Pimcore\Model\DataObject\Classificationstore\KeyConfig;
 use Pimcore\Model\DataObject\Classificationstore\KeyGroupRelation;
 use Pimcore\Model\DataObject\Classificationstore\Service;
@@ -33,16 +31,13 @@ public function clearDefinitionsCache(): void
         Service::clearDefinitionsCache();
     }
 
-    /**
-     * @throws Exception
-     */
     public function getFieldDefinitionFromKeyConfig(
         KeyConfig|KeyGroupRelation $keyConfig
-    ): EncryptedField|Data|null {
+    ): ?Data {
         return Service::getFieldDefinitionFromKeyConfig($keyConfig);
     }
 
-    public function getFieldDefinitionFromJson(array $definition, string $type): EncryptedField|Data|null
+    public function getFieldDefinitionFromJson(array $definition, string $type): ?Data
     {
         return Service::getFieldDefinitionFromJson($definition, $type);
     }
diff --git a/src/Models/DataObject/ClassificationStore/ServiceResolverInterface.php b/src/Models/DataObject/ClassificationStore/ServiceResolverInterface.php
index 51fd92c..bea0561 100644
--- a/src/Models/DataObject/ClassificationStore/ServiceResolverInterface.php
+++ b/src/Models/DataObject/ClassificationStore/ServiceResolverInterface.php
@@ -17,7 +17,6 @@
 namespace Pimcore\Bundle\StaticResolverBundle\Models\DataObject\ClassificationStore;
 
 use Pimcore\Model\DataObject\ClassDefinition\Data;
-use Pimcore\Model\DataObject\ClassDefinition\Data\EncryptedField;
 use Pimcore\Model\DataObject\Classificationstore\KeyConfig;
 use Pimcore\Model\DataObject\Classificationstore\KeyGroupRelation;
 
@@ -30,7 +29,7 @@ public function clearDefinitionsCache(): void;
 
     public function getFieldDefinitionFromKeyConfig(
         KeyConfig|KeyGroupRelation $keyConfig
-    ): EncryptedField|Data|null;
+    ): ?Data;
 
-    public function getFieldDefinitionFromJson(array $definition, string $type): EncryptedField|Data|null;
+    public function getFieldDefinitionFromJson(array $definition, string $type): ?Data;
 }