diff --git a/config/assets.yaml b/config/assets.yaml
index f980bafea..28aee31b2 100644
--- a/config/assets.yaml
+++ b/config/assets.yaml
@@ -13,4 +13,8 @@ services:
 
   # Hydrators
   Pimcore\Bundle\StudioBackendBundle\Asset\Hydrator\CustomSettingsHydratorInterface:
-    class: Pimcore\Bundle\StudioBackendBundle\Asset\Hydrator\CustomSettingsHydrator
\ No newline at end of file
+    class: Pimcore\Bundle\StudioBackendBundle\Asset\Hydrator\CustomSettingsHydrator
+
+  # Encoder
+  Pimcore\Bundle\StudioBackendBundle\Asset\Encoder\TextEncoderInterface:
+      class: Pimcore\Bundle\StudioBackendBundle\Asset\Encoder\TextEncoder
\ No newline at end of file
diff --git a/config/properties.yaml b/config/properties.yaml
new file mode 100644
index 000000000..fa775d045
--- /dev/null
+++ b/config/properties.yaml
@@ -0,0 +1,23 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  # controllers are imported separately to make sure they're public
+  # and have a tag that allows actions to type-hint services
+  Pimcore\Bundle\StudioBackendBundle\Property\Controller\:
+    resource: '../src/Property/Controller'
+    public: true
+    tags: [ 'controller.service_arguments' ]
+
+
+  Pimcore\Bundle\StudioBackendBundle\Property\Repository\PropertyRepositoryInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Property\Repository\PropertyRepository
+
+  Pimcore\Bundle\StudioBackendBundle\Property\Service\PropertyServiceInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Property\Service\PropertyService
+
+  Pimcore\Bundle\StudioBackendBundle\Property\Hydrator\PropertyHydratorInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Property\Hydrator\PropertyHydrator
+
diff --git a/src/Asset/Controller/Data/TextController.php b/src/Asset/Controller/Data/TextController.php
new file mode 100644
index 000000000..226e2e548
--- /dev/null
+++ b/src/Asset/Controller/Data/TextController.php
@@ -0,0 +1,79 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Controller\Data;
+
+use OpenApi\Attributes\Get;
+use Pimcore\Bundle\StaticResolverBundle\Models\Element\ServiceResolverInterface;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Encoder\TextEncoderInterface;
+use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Path\IdParameter;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Content\DataJson;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\NotFoundResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnauthorizedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnprocessableContentResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnsupportedMediaTypeResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags;
+use Pimcore\Bundle\StudioBackendBundle\Util\Traits\ElementProviderTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ */
+final class TextController extends AbstractApiController
+{
+    use ElementProviderTrait;
+
+    public function __construct(
+        SerializerInterface $serializer,
+        private readonly ServiceResolverInterface $serviceResolver,
+        private readonly TextEncoderInterface $textEncoder,
+
+    ) {
+        parent::__construct($serializer);
+    }
+
+    #[Route('/assets/{id}/text', name: 'pimcore_studio_api_get_asset_data_text', methods: ['GET'])]
+    //#[IsGranted('STUDIO_API')]
+    //#[IsGranted(UserPermissions::ASSETS->value)]
+    #[Get(
+        path: self::API_PATH . '/assets/{id}/text',
+        operationId: 'getAssetDataTextById',
+        summary: 'Get asset data in text UTF8 representation by id',
+        security: self::SECURITY_SCHEME,
+        tags: [Tags::Assets->name]
+    )]
+    #[IdParameter(type: 'asset')]
+    #[SuccessResponse(
+        description: 'UTF8 encoded text data',
+        content: new DataJson('UTF 8 encoded text data')
+    )]
+    #[UnauthorizedResponse]
+    #[NotFoundResponse]
+    #[MethodNotAllowedResponse]
+    #[UnsupportedMediaTypeResponse]
+    #[UnprocessableContentResponse]
+    public function getTextData(int $id): JsonResponse
+    {
+        $element = $this->getElement($this->serviceResolver, 'asset', $id);
+
+        return $this->jsonResponse(['data' => $this->textEncoder->encodeUTF8($element)]);
+    }
+}
diff --git a/src/Asset/Encoder/TextEncoder.php b/src/Asset/Encoder/TextEncoder.php
new file mode 100644
index 000000000..bc35fb6b6
--- /dev/null
+++ b/src/Asset/Encoder/TextEncoder.php
@@ -0,0 +1,44 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Encoder;
+
+use ForceUTF8\Encoding;
+use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidElementTypeException;
+use Pimcore\Bundle\StudioBackendBundle\Exception\MaxFileSizeExceededException;
+use Pimcore\Model\Asset\Text;
+use Pimcore\Model\Element\ElementInterface;
+
+final class TextEncoder implements TextEncoderInterface
+{
+    private const MAX_FILE_SIZE = 2000000;
+
+    /**
+     * @throws InvalidElementTypeException|MaxFileSizeExceededException
+     */
+    public function encodeUTF8(ElementInterface $element): string
+    {
+        if (!$element instanceof Text) {
+            throw new InvalidElementTypeException('Element must be an instance of Text');
+        }
+
+        if ($element->getFileSize() > self::MAX_FILE_SIZE) {
+            throw new MaxFileSizeExceededException(self::MAX_FILE_SIZE);
+        }
+
+        return Encoding::toUTF8($element->getData());
+    }
+}
diff --git a/src/Asset/Encoder/TextEncoderInterface.php b/src/Asset/Encoder/TextEncoderInterface.php
new file mode 100644
index 000000000..a8aeb5574
--- /dev/null
+++ b/src/Asset/Encoder/TextEncoderInterface.php
@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Encoder;
+
+use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidElementTypeException;
+use Pimcore\Bundle\StudioBackendBundle\Exception\MaxFileSizeExceededException;
+use Pimcore\Model\Element\ElementInterface;
+
+interface TextEncoderInterface
+{
+    /**
+     * @throws InvalidElementTypeException|MaxFileSizeExceededException
+     */
+    public function encodeUTF8(ElementInterface $element): string;
+}
diff --git a/src/DependencyInjection/PimcoreStudioBackendExtension.php b/src/DependencyInjection/PimcoreStudioBackendExtension.php
index a3402497f..ed30670d9 100644
--- a/src/DependencyInjection/PimcoreStudioBackendExtension.php
+++ b/src/DependencyInjection/PimcoreStudioBackendExtension.php
@@ -60,6 +60,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $loader->load('filters.yaml');
         $loader->load('icon.yaml');
         $loader->load('open_api.yaml');
+        $loader->load('properties.yaml');
         $loader->load('security.yaml');
         $loader->load('services.yaml');
         $loader->load('translation.yaml');
diff --git a/src/Event/AbstractPreResponseEvent.php b/src/Event/AbstractPreResponseEvent.php
new file mode 100644
index 000000000..9c07aff25
--- /dev/null
+++ b/src/Event/AbstractPreResponseEvent.php
@@ -0,0 +1,48 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Event;
+
+use Pimcore\Bundle\StudioBackendBundle\Util\Schema\AdditionalAttributesInterface;
+use Symfony\Contracts\EventDispatcher\Event;
+
+/**
+ * @internal
+ */
+abstract class AbstractPreResponseEvent extends Event
+{
+    public function __construct(protected readonly AdditionalAttributesInterface $responseObject)
+    {
+    }
+
+    public function hasAdditionalAttribute(string $key): bool {
+        return $this->responseObject->hasAdditionalAttribute($key);
+    }
+
+    public function getAdditionalAttribute(string $key): mixed
+    {
+        return $this->responseObject->getAdditionalAttribute($key);
+    }
+
+    public function addAdditionalAttribute(string $key, mixed $value): void
+    {
+        $this->responseObject->addAdditionalAttribute($key, $value);
+    }
+
+    public function removeAdditionalAttribute(string $key): void {
+        $this->responseObject->removeAdditionalAttribute($key);
+    }
+}
diff --git a/src/Exception/ElementSavingFailedException.php b/src/Exception/ElementSavingFailedException.php
new file mode 100644
index 000000000..ff327e98a
--- /dev/null
+++ b/src/Exception/ElementSavingFailedException.php
@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Exception;
+
+/**
+ * @internal
+ */
+final class ElementSavingFailedException extends AbstractApiException
+{
+    public function __construct(int $id, ?string $error = null)
+    {
+        parent::__construct(500, sprintf(
+            'Failed to save element with ID %s: %s',
+            $id,
+            $error ?? 'Unknown error'
+        ));
+    }
+}
diff --git a/src/Exception/MaxFileSizeExceededException.php b/src/Exception/MaxFileSizeExceededException.php
new file mode 100644
index 000000000..ddb11f3be
--- /dev/null
+++ b/src/Exception/MaxFileSizeExceededException.php
@@ -0,0 +1,31 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Exception;
+
+/**
+ * @internal
+ */
+final class MaxFileSizeExceededException extends AbstractApiException
+{
+    public function __construct(int|float $maxFileSize)
+    {
+        parent::__construct(
+            413,
+            sprintf('Max file size of %d bytes exceeded', $maxFileSize)
+        );
+    }
+}
diff --git a/src/Exception/NotWriteableException.php b/src/Exception/NotWriteableException.php
new file mode 100644
index 000000000..2f1f9b97c
--- /dev/null
+++ b/src/Exception/NotWriteableException.php
@@ -0,0 +1,31 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Exception;
+
+/**
+ * @internal
+ */
+final class NotWriteableException extends AbstractApiException
+{
+    public function __construct(string $type)
+    {
+        parent::__construct(500, sprintf(
+            'Cannot create: %s',
+            $type
+        ));
+    }
+}
diff --git a/src/Exception/PropertyNotFoundException.php b/src/Exception/PropertyNotFoundException.php
new file mode 100644
index 000000000..0ec6ecec9
--- /dev/null
+++ b/src/Exception/PropertyNotFoundException.php
@@ -0,0 +1,28 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Exception;
+
+/**
+ * @internal
+ */
+final class PropertyNotFoundException extends AbstractApiException
+{
+    public function __construct(string $id)
+    {
+        parent::__construct(404, 'Property with ID ' . $id . ' not found');
+    }
+}
diff --git a/src/OpenApi/Attributes/Content/ItemsJson.php b/src/OpenApi/Attributes/Content/ItemsJson.php
new file mode 100644
index 000000000..8de441f63
--- /dev/null
+++ b/src/OpenApi/Attributes/Content/ItemsJson.php
@@ -0,0 +1,37 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Content;
+
+use OpenApi\Attributes\Items;
+use OpenApi\Attributes\JsonContent;
+use OpenApi\Attributes\Property;
+
+/**
+ * @internal
+ */
+final class ItemsJson extends JsonContent
+{
+    public function __construct(string $schema)
+    {
+        parent::__construct(
+            properties: [
+                new Property('items', type: 'array', items: new Items(ref:$schema)),
+            ],
+            type: 'object',
+        );
+    }
+}
diff --git a/src/OpenApi/Attributes/Parameters/Path/ElementTypeParameter.php b/src/OpenApi/Attributes/Parameters/Path/ElementTypeParameter.php
new file mode 100644
index 000000000..a23747650
--- /dev/null
+++ b/src/OpenApi/Attributes/Parameters/Path/ElementTypeParameter.php
@@ -0,0 +1,45 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Path;
+
+use Attribute;
+use OpenApi\Attributes\PathParameter;
+use OpenApi\Attributes\Schema;
+use Pimcore\Bundle\StudioBackendBundle\Util\Constants\ElementTypes;
+
+#[Attribute(Attribute::TARGET_METHOD)]
+final class ElementTypeParameter extends PathParameter
+{
+    public function __construct()
+    {
+        parent::__construct(
+            name: 'elementType',
+            description: 'Filter elements by matching element type.',
+            in: 'path',
+            required: true,
+            schema: new Schema(
+                type: 'string',
+                enum: [
+                    ElementTypes::TYPE_ASSET,
+                    ElementTypes::TYPE_DOCUMENT,
+                    ElementTypes::TYPE_DATA_OBJECT,
+                ],
+                example: ElementTypes::TYPE_DATA_OBJECT,
+            ),
+        );
+    }
+}
diff --git a/src/OpenApi/Attributes/Parameters/Path/IdParameter.php b/src/OpenApi/Attributes/Parameters/Path/IdParameter.php
index bdf1e7592..9389ecd88 100644
--- a/src/OpenApi/Attributes/Parameters/Path/IdParameter.php
+++ b/src/OpenApi/Attributes/Parameters/Path/IdParameter.php
@@ -23,14 +23,14 @@
 #[Attribute(Attribute::TARGET_METHOD)]
 final class IdParameter extends PathParameter
 {
-    public function __construct(string $type = 'element')
+    public function __construct(string $type = 'element', Schema $schema = new Schema(type: 'integer', example: 83))
     {
         parent::__construct(
             name: 'id',
             description: 'ID of the ' . $type,
             in: 'path',
             required: true,
-            schema: new Schema(type: 'integer', example: 83),
+            schema: $schema,
         );
     }
 }
diff --git a/src/OpenApi/Attributes/Parameters/Query/ElementTypeParameter.php b/src/OpenApi/Attributes/Parameters/Query/ElementTypeParameter.php
index f1125956e..fa9574f32 100644
--- a/src/OpenApi/Attributes/Parameters/Query/ElementTypeParameter.php
+++ b/src/OpenApi/Attributes/Parameters/Query/ElementTypeParameter.php
@@ -24,13 +24,13 @@
 #[Attribute(Attribute::TARGET_METHOD)]
 final class ElementTypeParameter extends QueryParameter
 {
-    public function __construct()
+    public function __construct(bool $required = true, ?string $example = ElementTypes::TYPE_DATA_OBJECT)
     {
         parent::__construct(
             name: 'elementType',
             description: 'Filter elements by matching element type.',
             in: 'query',
-            required: true,
+            required: $required,
             schema: new Schema(
                 type: 'string',
                 enum: [
@@ -38,7 +38,7 @@ enum: [
                     ElementTypes::TYPE_DOCUMENT,
                     ElementTypes::TYPE_DATA_OBJECT,
                 ],
-                example: ElementTypes::TYPE_DATA_OBJECT,
+                example: $example,
             ),
         );
     }
diff --git a/src/OpenApi/Attributes/Parameters/Query/FilterParameter.php b/src/OpenApi/Attributes/Parameters/Query/FilterParameter.php
new file mode 100644
index 000000000..d78a5c2f1
--- /dev/null
+++ b/src/OpenApi/Attributes/Parameters/Query/FilterParameter.php
@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query;
+
+use Attribute;
+use OpenApi\Attributes\QueryParameter as OpenApiQueryParameter;
+use OpenApi\Attributes\Schema;
+
+#[Attribute(Attribute::TARGET_METHOD)]
+final class FilterParameter extends OpenApiQueryParameter
+{
+    public function __construct()
+    {
+        parent::__construct(
+            name: 'filter',
+            description: 'Filter for properties',
+            in: 'filter',
+            required: false,
+            schema: new Schema(type: 'string', example: null),
+        );
+    }
+}
diff --git a/src/OpenApi/Attributes/Response/Content/DataJson.php b/src/OpenApi/Attributes/Response/Content/DataJson.php
new file mode 100644
index 000000000..542f6e32d
--- /dev/null
+++ b/src/OpenApi/Attributes/Response/Content/DataJson.php
@@ -0,0 +1,42 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Content;
+
+use OpenApi\Attributes\JsonContent;
+use OpenApi\Attributes\Property;
+
+/**
+ * @internal
+ */
+final class DataJson extends JsonContent
+{
+    public function __construct(string $description = '')
+    {
+        parent::__construct(
+            properties: [
+                new Property(
+                    'data',
+                    title: 'data',
+                    description: $description,
+                    type: 'string',
+                    example: 'Test content'
+                ),
+            ],
+            type: 'object',
+        );
+    }
+}
diff --git a/src/OpenApi/Config/Tags.php b/src/OpenApi/Config/Tags.php
index d2ef22bb5..c1a8483cb 100644
--- a/src/OpenApi/Config/Tags.php
+++ b/src/OpenApi/Config/Tags.php
@@ -37,6 +37,14 @@
     name: Tags::Dependencies->name,
     description: 'Get dependencies for a single element.'
 )]
+#[Tag(
+    name: Tags::Properties->name,
+    description: 'Property operations to get/update/create/delete properties'
+)]
+#[Tag(
+    name: Tags::PropertiesForElement->value,
+    description: 'Property operations to get/update properties for an element'
+)]
 #[Tag(
     name: Tags::Translation->name,
     description: 'Get translations either for a single key or multiple keys'
@@ -45,12 +53,14 @@
     name: Tags::Versions->name,
     description: 'Versions operations to get/list/publish/delete and cleanup versions'
 )]
-enum Tags
+enum Tags: string
 {
-    case Assets;
-    case Authorization;
-    case DataObjects;
-    case Dependencies;
-    case Translation;
-    case Versions;
+    case Assets = 'Assets';
+    case Authorization = 'Authorization';
+    case DataObjects = 'DataObjects';
+    case Dependencies = 'Dependencies';
+    case Properties = 'Properties';
+    case PropertiesForElement = 'Properties for Element';
+    case Translation = 'Translation';
+    case Versions = 'Versions';
 }
diff --git a/src/Property/Attributes/Request/ElementPropertyRequestBody.php b/src/Property/Attributes/Request/ElementPropertyRequestBody.php
new file mode 100644
index 000000000..00684e5f6
--- /dev/null
+++ b/src/Property/Attributes/Request/ElementPropertyRequestBody.php
@@ -0,0 +1,34 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Attributes\Request;
+
+use Attribute;
+use OpenApi\Attributes\RequestBody;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Content\ItemsJson;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\UpdateElementProperty;
+
+#[Attribute(Attribute::TARGET_METHOD)]
+final class ElementPropertyRequestBody extends RequestBody
+{
+    public function __construct()
+    {
+        parent::__construct(
+            required: true,
+            content: new ItemsJson(UpdateElementProperty::class)
+        );
+    }
+}
diff --git a/src/Property/Attributes/Request/PredefinedPropertyRequestBody.php b/src/Property/Attributes/Request/PredefinedPropertyRequestBody.php
new file mode 100644
index 000000000..b79ae0e91
--- /dev/null
+++ b/src/Property/Attributes/Request/PredefinedPropertyRequestBody.php
@@ -0,0 +1,34 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Attributes\Request;
+
+use Attribute;
+use OpenApi\Attributes\JsonContent;
+use OpenApi\Attributes\RequestBody;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\UpdatePredefinedProperty;
+
+#[Attribute(Attribute::TARGET_METHOD)]
+final class PredefinedPropertyRequestBody extends RequestBody
+{
+    public function __construct()
+    {
+        parent::__construct(
+            required: true,
+            content: new JsonContent(ref: UpdatePredefinedProperty::class)
+        );
+    }
+}
diff --git a/src/Property/Controller/CollectionController.php b/src/Property/Controller/CollectionController.php
new file mode 100644
index 000000000..dfafd2eaf
--- /dev/null
+++ b/src/Property/Controller/CollectionController.php
@@ -0,0 +1,83 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Controller;
+
+use OpenApi\Attributes\Get;
+use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidQueryTypeException;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Content\ItemsJson;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\ElementTypeParameter;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\FilterParameter;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\BadRequestResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnauthorizedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnprocessableContentResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnsupportedMediaTypeResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags;
+use Pimcore\Bundle\StudioBackendBundle\Property\Request\PropertiesParameters;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\PredefinedProperty;
+use Pimcore\Bundle\StudioBackendBundle\Property\Service\PropertyServiceInterface;
+use Pimcore\Bundle\StudioBackendBundle\Util\Traits\PaginatedResponseTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpKernel\Attribute\MapQueryString;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ */
+final class CollectionController extends AbstractApiController
+{
+    use PaginatedResponseTrait;
+
+    public function __construct(
+        SerializerInterface $serializer,
+        private readonly PropertyServiceInterface $propertyService,
+    ) {
+        parent::__construct($serializer);
+    }
+
+    /**
+     * @throws InvalidQueryTypeException
+     */
+    #[Route('/properties', name: 'pimcore_studio_api_properties', methods: ['GET'])]
+    //#[IsGranted('STUDIO_API')]
+    #[Get(
+        path: self::API_PATH . '/properties',
+        operationId: 'getProperties',
+        summary: 'Get all predefined properties. You can filter by type and query',
+        security: self::SECURITY_SCHEME,
+        tags: [Tags::Properties->name]
+    )]
+    #[ElementTypeParameter(false, null)]
+    #[FilterParameter]
+    #[SuccessResponse(
+        description: 'Predefined properties filtered based on type and query parameters',
+        content: new ItemsJson(PredefinedProperty::class)
+    )]
+    #[BadRequestResponse]
+    #[UnauthorizedResponse]
+    #[MethodNotAllowedResponse]
+    #[UnsupportedMediaTypeResponse]
+    #[UnprocessableContentResponse]
+    public function getProperties(
+        #[MapQueryString] PropertiesParameters $parameters = new PropertiesParameters()
+    ): JsonResponse {
+        return $this->jsonResponse(['items' => $this->propertyService->getPredefinedProperties($parameters)]);
+    }
+}
diff --git a/src/Property/Controller/CreateController.php b/src/Property/Controller/CreateController.php
new file mode 100644
index 000000000..c44cc9ed4
--- /dev/null
+++ b/src/Property/Controller/CreateController.php
@@ -0,0 +1,72 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Controller;
+
+use OpenApi\Attributes\JsonContent;
+use OpenApi\Attributes\Post;
+use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\Exception\NotWriteableException;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\BadRequestResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnauthorizedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnprocessableContentResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnsupportedMediaTypeResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\PredefinedProperty;
+use Pimcore\Bundle\StudioBackendBundle\Property\Service\PropertyServiceInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ */
+final class CreateController extends AbstractApiController
+{
+    public function __construct(
+        SerializerInterface $serializer,
+        private readonly PropertyServiceInterface $propertyService,
+    ) {
+        parent::__construct($serializer);
+    }
+
+    /**
+     * @throws NotWriteableException
+     */
+    #[Route('/property', name: 'pimcore_studio_api_create_property', methods: ['POST'])]
+    #[POST(
+        path: self::API_PATH . '/property',
+        operationId: 'createProperty',
+        summary: 'Creating new property with default values',
+        security: self::SECURITY_SCHEME,
+        tags: [Tags::Properties->name]
+    )]
+    #[SuccessResponse(
+        description: 'Element Properties data as json',
+        content: new JsonContent(ref: PredefinedProperty::class, type: 'object')
+    )]
+    #[BadRequestResponse]
+    #[UnauthorizedResponse]
+    #[MethodNotAllowedResponse]
+    #[UnsupportedMediaTypeResponse]
+    #[UnprocessableContentResponse]
+    public function createProperty(): JsonResponse
+    {
+        return $this->jsonResponse($this->propertyService->createPredefinedProperty());
+    }
+}
diff --git a/src/Property/Controller/DeleteController.php b/src/Property/Controller/DeleteController.php
new file mode 100644
index 000000000..d56682570
--- /dev/null
+++ b/src/Property/Controller/DeleteController.php
@@ -0,0 +1,77 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Controller;
+
+use OpenApi\Attributes\Delete;
+use OpenApi\Attributes\Schema;
+use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\Exception\PropertyNotFoundException;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Path\IdParameter;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Content\IdJson;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\NotFoundResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnauthorizedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnprocessableContentResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnsupportedMediaTypeResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags;
+use Pimcore\Bundle\StudioBackendBundle\Property\Service\PropertyServiceInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ */
+final class DeleteController extends AbstractApiController
+{
+    public function __construct(
+        SerializerInterface $serializer,
+        private readonly PropertyServiceInterface $propertyService
+    ) {
+        parent::__construct($serializer);
+    }
+
+    /**
+     * @throws PropertyNotFoundException
+     */
+    #[Route('/properties/{id}', name: 'pimcore_studio_api_delete_properties', methods: ['DELETE'])]
+    //#[IsGranted('STUDIO_API')]
+    #[Delete(
+        path: self::API_PATH . '/properties/{id}',
+        operationId: 'deleteProperty',
+        summary: 'Delete property with given id',
+        security: self::SECURITY_SCHEME,
+        tags: [Tags::Properties->name]
+    )]
+    #[IdParameter(type: 'property', schema: new Schema(type: 'string', example: 'alpha-numerical'))]
+    #[SuccessResponse(
+        description: 'Element Properties data as json',
+        content: new IdJson('ID of deleted property')
+    )]
+    #[UnauthorizedResponse]
+    #[NotFoundResponse]
+    #[MethodNotAllowedResponse]
+    #[UnsupportedMediaTypeResponse]
+    #[UnprocessableContentResponse]
+    public function deleteProperty(string $id): JsonResponse
+    {
+        $this->propertyService->deletePredefinedProperty($id);
+
+        return $this->jsonResponse(['id' => $id]);
+    }
+}
diff --git a/src/Property/Controller/Element/CollectionController.php b/src/Property/Controller/Element/CollectionController.php
new file mode 100644
index 000000000..91644b48f
--- /dev/null
+++ b/src/Property/Controller/Element/CollectionController.php
@@ -0,0 +1,75 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Controller\Element;
+
+use OpenApi\Attributes\Get;
+use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Content\ItemsJson;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Path\ElementTypeParameter;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Path\IdParameter;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\NotFoundResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnauthorizedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnprocessableContentResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnsupportedMediaTypeResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\ElementProperty;
+use Pimcore\Bundle\StudioBackendBundle\Property\Service\PropertyServiceInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ */
+final class CollectionController extends AbstractApiController
+{
+    public function __construct(
+        SerializerInterface $serializer,
+        private readonly PropertyServiceInterface $propertyService,
+    ) {
+        parent::__construct($serializer);
+    }
+
+    #[Route('/properties/{elementType}/{id}', name: 'pimcore_studio_api_get_element_properties', methods: ['GET'])]
+    //#[IsGranted('STUDIO_API')]
+    #[Get(
+        path: self::API_PATH . '/properties/{elementType}/{id}',
+        operationId: 'getPropertiesForElementByTypeAndId',
+        summary: 'Get properties for an element based on the element type and the element id',
+        security: self::SECURITY_SCHEME,
+        tags: [Tags::PropertiesForElement->value]
+    )]
+    #[ElementTypeParameter]
+    #[IdParameter(type: 'element')]
+    #[SuccessResponse(
+        description: 'Element Properties data as json',
+        content: new ItemsJson(ElementProperty::class)
+    )]
+    #[UnauthorizedResponse]
+    #[NotFoundResponse]
+    #[MethodNotAllowedResponse]
+    #[UnsupportedMediaTypeResponse]
+    #[UnprocessableContentResponse]
+    public function getProperties(string $elementType, int $id): JsonResponse
+    {
+        return $this->jsonResponse(
+            ['items' => $this->propertyService->getElementProperties($elementType, $id)]
+        );
+    }
+}
diff --git a/src/Property/Controller/Element/UpdateController.php b/src/Property/Controller/Element/UpdateController.php
new file mode 100644
index 000000000..e066fef11
--- /dev/null
+++ b/src/Property/Controller/Element/UpdateController.php
@@ -0,0 +1,84 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Controller\Element;
+
+use OpenApi\Attributes\Put;
+use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Content\ItemsJson;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Path\ElementTypeParameter;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Path\IdParameter;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\NotFoundResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnauthorizedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnprocessableContentResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnsupportedMediaTypeResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags;
+use Pimcore\Bundle\StudioBackendBundle\Property\Attributes\Request\ElementPropertyRequestBody;
+use Pimcore\Bundle\StudioBackendBundle\Property\Request\UpdateElementProperties;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\ElementProperty;
+use Pimcore\Bundle\StudioBackendBundle\Property\Service\PropertyServiceInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ */
+final class UpdateController extends AbstractApiController
+{
+    public function __construct(
+        SerializerInterface $serializer,
+        private readonly PropertyServiceInterface $propertyService
+    ) {
+        parent::__construct($serializer);
+    }
+
+    #[Route('/properties/{elementType}/{id}', name: 'pimcore_studio_api_update_element_properties', methods: ['PUT'])]
+    //#[IsGranted('STUDIO_API')]
+    #[Put(
+        path: self::API_PATH . '/properties/{elementType}/{id}',
+        operationId: 'updatePropertiesForElementByTypeAndId',
+        summary: 'Update properties for an element based on the element type and the element id',
+        security: self::SECURITY_SCHEME,
+        tags: [Tags::PropertiesForElement->value]
+    )]
+    #[ElementTypeParameter]
+    #[IdParameter(type: 'element')]
+    #[ElementPropertyRequestBody]
+    #[SuccessResponse(
+        description: 'Element Properties data as json',
+        content: new ItemsJson(ElementProperty::class)
+    )]
+    #[UnauthorizedResponse]
+    #[NotFoundResponse]
+    #[MethodNotAllowedResponse]
+    #[UnsupportedMediaTypeResponse]
+    #[UnprocessableContentResponse]
+    public function updateProperties(
+        string $elementType,
+        int $id,
+        #[MapRequestPayload] UpdateElementProperties $items
+    ): JsonResponse {
+        $this->propertyService->updateElementProperties($elementType, $id, $items);
+
+        return $this->jsonResponse(
+            ['items' => $this->propertyService->getElementProperties($elementType, $id)]
+        );
+    }
+}
diff --git a/src/Property/Controller/UpdateController.php b/src/Property/Controller/UpdateController.php
new file mode 100644
index 000000000..d5809d184
--- /dev/null
+++ b/src/Property/Controller/UpdateController.php
@@ -0,0 +1,83 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Controller;
+
+use OpenApi\Attributes\JsonContent;
+use OpenApi\Attributes\Put;
+use OpenApi\Attributes\Schema;
+use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\Exception\PropertyNotFoundException;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Path\IdParameter;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\BadRequestResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnauthorizedResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnprocessableContentResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnsupportedMediaTypeResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags;
+use Pimcore\Bundle\StudioBackendBundle\Property\Attributes\Request\PredefinedPropertyRequestBody;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\PredefinedProperty;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\UpdatePredefinedProperty;
+use Pimcore\Bundle\StudioBackendBundle\Property\Service\PropertyServiceInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ */
+final class UpdateController extends AbstractApiController
+{
+    public function __construct(
+        SerializerInterface $serializer,
+        private readonly PropertyServiceInterface $propertyService,
+    ) {
+        parent::__construct($serializer);
+    }
+
+    /**
+     * @throws PropertyNotFoundException
+     */
+    #[Route('/properties/{id}', name: 'pimcore_studio_api_update_property', methods: ['PUT'])]
+    #[Put(
+        path: self::API_PATH . '/properties/{id}',
+        operationId: 'updateProperty',
+        summary: 'Updating a property',
+        security: self::SECURITY_SCHEME,
+        tags: [Tags::Properties->name]
+    )]
+    #[IdParameter(type: 'property', schema: new Schema(type: 'string', example: 'alpha-numerical'))]
+    #[PredefinedPropertyRequestBody]
+    #[SuccessResponse(
+        description: 'Updated property',
+        content: new JsonContent(ref: PredefinedProperty::class, type: 'object')
+    )]
+    #[BadRequestResponse]
+    #[UnauthorizedResponse]
+    #[MethodNotAllowedResponse]
+    #[UnsupportedMediaTypeResponse]
+    #[UnprocessableContentResponse]
+    public function updateProperty(
+        string $id,
+        #[MapRequestPayload] UpdatePredefinedProperty $updatePredefinedProperty
+    ): JsonResponse {
+        $this->propertyService->updatePredefinedProperty($id, $updatePredefinedProperty);
+
+        return $this->jsonResponse($this->propertyService->getPredefinedProperty($id));
+    }
+}
diff --git a/src/Property/Event/ElementPropertyEvent.php b/src/Property/Event/ElementPropertyEvent.php
new file mode 100644
index 000000000..c6687092e
--- /dev/null
+++ b/src/Property/Event/ElementPropertyEvent.php
@@ -0,0 +1,39 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Event;
+
+use Pimcore\Bundle\StudioBackendBundle\Event\AbstractPreResponseEvent;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\ElementProperty;
+
+final class ElementPropertyEvent extends AbstractPreResponseEvent
+{
+    public const EVENT_NAME = 'pre_response.element_property';
+    public function __construct(
+        private readonly ElementProperty $elementProperty
+    )
+    {
+        parent::__construct($elementProperty);
+    }
+
+    /**
+     * Use this to get additional infos out of the response object
+     */
+    public function getElementProperty(): ElementProperty
+    {
+        return $this->elementProperty;
+    }
+}
diff --git a/src/Property/Event/PredefinedPropertyEvent.php b/src/Property/Event/PredefinedPropertyEvent.php
new file mode 100644
index 000000000..2a5d4a9d9
--- /dev/null
+++ b/src/Property/Event/PredefinedPropertyEvent.php
@@ -0,0 +1,39 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Event;
+
+use Pimcore\Bundle\StudioBackendBundle\Event\AbstractPreResponseEvent;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\PredefinedProperty;
+
+final class PredefinedPropertyEvent extends AbstractPreResponseEvent
+{
+    public const EVENT_NAME = 'pre_response.predefined_property';
+    public function __construct(
+        private readonly PredefinedProperty $predefinedProperty
+    )
+    {
+        parent::__construct($predefinedProperty);
+    }
+
+    /**
+     * Use this to get additional infos out of the response object
+     */
+    public function getPredefinedProperty(): PredefinedProperty
+    {
+        return $this->predefinedProperty;
+    }
+}
diff --git a/src/Property/Hydrator/PropertyHydrator.php b/src/Property/Hydrator/PropertyHydrator.php
new file mode 100644
index 000000000..9c85a6d34
--- /dev/null
+++ b/src/Property/Hydrator/PropertyHydrator.php
@@ -0,0 +1,130 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Hydrator;
+
+use Pimcore\Bundle\StaticResolverBundle\Models\Predefined\PredefinedResolverInterface;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\ElementProperty;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\PredefinedProperty;
+use Pimcore\Model\Asset;
+use Pimcore\Model\DataObject\AbstractObject;
+use Pimcore\Model\Document;
+use Pimcore\Model\Property;
+use Pimcore\Model\Property\Predefined;
+
+/**
+ * @internal
+ */
+final readonly class PropertyHydrator implements PropertyHydratorInterface
+{
+    private const ALLOWED_MODEL_PROPERTIES = [
+        'key',
+        'filename',
+        'path',
+        'id',
+        'type',
+    ];
+
+    private const EXCLUDED_PROPERTIES = [
+        'cid',
+        'ctype',
+        'cpath',
+        'dao',
+    ];
+
+    public function __construct(
+        private PredefinedResolverInterface $predefinedResolver
+    ) {
+    }
+
+    public function hydratePredefinedProperty(Predefined $property): PredefinedProperty
+    {
+        return new PredefinedProperty(
+            $property->getId(),
+            $property->getName(),
+            $property->getDescription(),
+            $property->getKey(),
+            $property->getType(),
+            $property->getData(),
+            $property->getConfig(),
+            $property->getCtype(),
+            $property->getInheritable(),
+            $property->getCreationDate(),
+            $property->getModificationDate()
+        );
+    }
+
+    public function hydrateElementProperty(Property $property): ElementProperty
+    {
+        $propertyData = $this->extractData($property);
+
+        return new ElementProperty(
+            $propertyData['name'],
+            $propertyData['modelData'] ?? $propertyData['data'],
+            $propertyData['type'],
+            $propertyData['inheritable'],
+            $propertyData['inherited'],
+            $propertyData['config'],
+            $propertyData['predefinedName'] ?? 'Custom',
+            $propertyData['description']
+        );
+    }
+
+    private function extractData(Property $property): array
+    {
+        $data['modelData'] = match (true) {
+            $property->getData() instanceof Document ||
+            $property->getData() instanceof Asset ||
+            $property->getData() instanceof AbstractObject => $this->extractDataFromModel($property->getData()),
+            default => null,
+        };
+
+        return [
+            ... $this->excludeProperties($property->getObjectVars()),
+            ... $data,
+            ... $this->extractPredefinedPropertyData($property),
+        ];
+    }
+
+    private function extractDataFromModel(Document|Asset|AbstractObject $data): array
+    {
+        return array_intersect_key($data->getObjectVars(), array_flip(self::ALLOWED_MODEL_PROPERTIES));
+    }
+
+    private function excludeProperties(array $values): array
+    {
+        return array_diff_key($values, array_flip(self::EXCLUDED_PROPERTIES));
+    }
+
+    private function extractPredefinedPropertyData(Property $property): array
+    {
+        $empty = ['config' => null, 'predefinedName' => null, 'description' => null];
+        if (!$property->getName() || !$property->getType()) {
+            return $empty;
+        }
+
+        $predefinedProperty = $this->predefinedResolver->getByKey($property->getName());
+        if (!$predefinedProperty || $predefinedProperty->getType() !== $property->getType()) {
+            return $empty;
+        }
+
+        return [
+            'config' => $predefinedProperty->getConfig(),
+            'predefinedName' => $predefinedProperty->getName(),
+            'description' => $predefinedProperty->getDescription(),
+        ];
+    }
+}
diff --git a/src/Property/Hydrator/PropertyHydratorInterface.php b/src/Property/Hydrator/PropertyHydratorInterface.php
new file mode 100644
index 000000000..5bd220bde
--- /dev/null
+++ b/src/Property/Hydrator/PropertyHydratorInterface.php
@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Hydrator;
+
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\ElementProperty;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\PredefinedProperty;
+use Pimcore\Model\Property;
+use Pimcore\Model\Property\Predefined;
+
+/**
+ * @internal
+ */
+interface PropertyHydratorInterface
+{
+    public function hydratePredefinedProperty(Predefined $property): PredefinedProperty;
+
+    public function hydrateElementProperty(Property $property): ElementProperty;
+}
diff --git a/src/Property/Repository/PropertyRepository.php b/src/Property/Repository/PropertyRepository.php
new file mode 100644
index 000000000..f8a3e373f
--- /dev/null
+++ b/src/Property/Repository/PropertyRepository.php
@@ -0,0 +1,155 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Repository;
+
+use Pimcore\Bundle\StaticResolverBundle\Models\Element\ServiceResolverInterface;
+use Pimcore\Bundle\StaticResolverBundle\Models\Predefined\PredefinedResolverInterface;
+use Pimcore\Bundle\StudioBackendBundle\Exception\ElementSavingFailedException;
+use Pimcore\Bundle\StudioBackendBundle\Exception\NotWriteableException;
+use Pimcore\Bundle\StudioBackendBundle\Exception\PropertyNotFoundException;
+use Pimcore\Bundle\StudioBackendBundle\Property\Request\PropertiesParameters;
+use Pimcore\Bundle\StudioBackendBundle\Property\Request\UpdateElementProperties;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\UpdatePredefinedProperty;
+use Pimcore\Bundle\StudioBackendBundle\Util\Constants\ElementTypes;
+use Pimcore\Bundle\StudioBackendBundle\Util\Traits\ElementProviderTrait;
+use Pimcore\Model\Element\DuplicateFullPathException;
+use Pimcore\Model\Property;
+use Pimcore\Model\Property\Predefined;
+use Pimcore\Model\Property\Predefined\Listing as PropertiesListing;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+/**
+ * @internal
+ */
+final readonly class PropertyRepository implements PropertyRepositoryInterface
+{
+    use ElementProviderTrait;
+
+    public function __construct(
+        private ServiceResolverInterface $serviceResolver,
+        private PredefinedResolverInterface $predefinedResolver,
+        private TranslatorInterface $translator
+    ) {
+    }
+
+    /**
+     * @throws NotWriteableException
+     */
+    public function createPredefinedProperty(): Predefined
+    {
+        if (!(new Predefined())->isWriteable()) {
+            throw new NotWriteableException('Predefined Property');
+        }
+
+        $property = $this->predefinedResolver->create();
+        $property->setCtype(ElementTypes::TYPE_DOCUMENT);
+        $property->setName('New Property');
+        $property->setKey('new_key');
+        $property->setType('text');
+        $property->save();
+
+        return $property;
+    }
+
+    public function getPredefinedProperty(string $id): Predefined
+    {
+        return $this->predefinedResolver->getById($id);
+    }
+
+    public function listProperties(PropertiesParameters $parameters): PropertiesListing
+    {
+        $list = new PropertiesListing();
+        $type = $parameters->getElementType();
+        $filter = $parameters->getFilter();
+        $translator = $this->translator;
+
+        $list->setFilter(static function (Predefined $predefined) use ($type, $filter, $translator) {
+
+            if ($type && !str_contains($predefined->getCtype(), $type)) {
+                return false;
+            }
+            if ($filter && stripos($translator->trans($predefined->getName(), [], 'admin'), $filter) === false) {
+                return false;
+            }
+
+            return true;
+        });
+
+        return $list;
+    }
+
+    /**
+     * @throws PropertyNotFoundException
+     */
+    public function updatePredefinedProperty(string $id, UpdatePredefinedProperty $property): void
+    {
+        $predefined = $this->predefinedResolver->getById($id);
+
+        if (!$predefined) {
+            throw new PropertyNotFoundException($id);
+        }
+
+        $predefined->setName($property->getName());
+        $predefined->setDescription($property->getDescription());
+        $predefined->setKey($property->getKey());
+        $predefined->setType($property->getType());
+        $predefined->setData($property->getData());
+        $predefined->setConfig($property->getConfig());
+        $predefined->setCtype($property->getCtype());
+        $predefined->setInheritable($property->isInheritable());
+
+        $predefined->save();
+    }
+
+    /**
+     * @throws PropertyNotFoundException
+     */
+    public function deletePredefinedProperty(string $id): void
+    {
+        $predefined = $this->predefinedResolver->getById($id);
+
+        if (!$predefined) {
+            throw new PropertyNotFoundException($id);
+        }
+
+        $predefined->delete();
+    }
+
+    /**
+     * @throws ElementSavingFailedException
+     */
+    public function updateElementProperties(string $elementType, int $id, UpdateElementProperties $items): void
+    {
+        $element = $this->getElement($this->serviceResolver, $elementType, $id);
+        $properties = [];
+        foreach($items->getProperties() as $updateProperty) {
+            $property = new Property();
+            $property->setType($updateProperty->getType());
+            $property->setName($updateProperty->getKey());
+            $property->setData($updateProperty->getData());
+            $property->setInheritable($updateProperty->getInheritable());
+            $properties[$updateProperty->getKey()] = $property;
+        }
+        $element->setProperties($properties);
+
+        try {
+            $element->save();
+        } catch (DuplicateFullPathException $e) {
+            throw new ElementSavingFailedException($id, $e->getMessage());
+        }
+    }
+}
diff --git a/src/Property/Repository/PropertyRepositoryInterface.php b/src/Property/Repository/PropertyRepositoryInterface.php
new file mode 100644
index 000000000..9c5906b0d
--- /dev/null
+++ b/src/Property/Repository/PropertyRepositoryInterface.php
@@ -0,0 +1,49 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Repository;
+
+use Pimcore\Bundle\StudioBackendBundle\Exception\ElementSavingFailedException;
+use Pimcore\Bundle\StudioBackendBundle\Property\Request\PropertiesParameters;
+use Pimcore\Bundle\StudioBackendBundle\Property\Request\UpdateElementProperties;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\UpdatePredefinedProperty;
+use Pimcore\Model\Property\Predefined;
+use Pimcore\Model\Property\Predefined\Listing as PropertiesListing;
+
+/**
+ * @internal
+ */
+interface PropertyRepositoryInterface
+{
+    public function createPredefinedProperty(): Predefined;
+
+    public function getPredefinedProperty(string $id): Predefined;
+
+    public function listProperties(PropertiesParameters $parameters): PropertiesListing;
+
+    public function updatePredefinedProperty(string $id, UpdatePredefinedProperty $property): void;
+
+    /**
+     * @throws ElementSavingFailedException
+     */
+    public function updateElementProperties(
+        string $elementType,
+        int $id,
+        UpdateElementProperties $items
+    ): void;
+
+    public function deletePredefinedProperty(string $id): void;
+}
diff --git a/src/Property/Request/PropertiesParameters.php b/src/Property/Request/PropertiesParameters.php
new file mode 100644
index 000000000..4e42e8aa1
--- /dev/null
+++ b/src/Property/Request/PropertiesParameters.php
@@ -0,0 +1,46 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Request;
+
+use Pimcore\Bundle\StudioBackendBundle\Util\Constants\ElementTypes;
+
+/**
+ * @internal
+ */
+final readonly class PropertiesParameters
+{
+    public function __construct(
+        private ?string $elementType = null,
+        private ?string $filter = null
+
+    ) {
+    }
+
+    public function getFilter(): ?string
+    {
+        return $this->filter;
+    }
+
+    public function getElementType(): ?string
+    {
+        if ($this->elementType === ElementTypes::TYPE_DATA_OBJECT) {
+            return ElementTypes::TYPE_OBJECT;
+        }
+
+        return $this->elementType;
+    }
+}
diff --git a/src/Property/Request/UpdateElementProperties.php b/src/Property/Request/UpdateElementProperties.php
new file mode 100644
index 000000000..bc92ffe7d
--- /dev/null
+++ b/src/Property/Request/UpdateElementProperties.php
@@ -0,0 +1,45 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Request;
+
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\UpdateElementProperty;
+
+/**
+ * @internal
+ */
+final readonly class UpdateElementProperties
+{
+    private array $properties;
+
+    public function __construct(
+        array $items
+    ) {
+        $this->properties = array_map(static function (array $propertyData) {
+            return new UpdateElementProperty(
+                $propertyData['key'],
+                $propertyData['data'],
+                $propertyData['type'],
+                $propertyData['inheritable'],
+            );
+        }, $items);
+    }
+
+    public function getProperties(): array
+    {
+        return $this->properties;
+    }
+}
diff --git a/src/Property/Schema/ElementProperty.php b/src/Property/Schema/ElementProperty.php
new file mode 100644
index 000000000..655508341
--- /dev/null
+++ b/src/Property/Schema/ElementProperty.php
@@ -0,0 +1,94 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Schema;
+
+use OpenApi\Attributes\Property;
+use OpenApi\Attributes\Schema;
+use Pimcore\Bundle\StudioBackendBundle\Util\Schema\AdditionalAttributesInterface;
+use Pimcore\Bundle\StudioBackendBundle\Util\Traits\AdditionalAttributesTrait;
+
+/**
+ * @internal
+ */
+#[Schema(
+    title: 'DataProperty',
+    type: 'object'
+)]
+final class ElementProperty implements AdditionalAttributesInterface
+{
+    use AdditionalAttributesTrait;
+
+    public function __construct(
+        #[Property(description: 'key', type: 'string', example: 'key_of_the_property')]
+        private readonly string $key,
+        #[Property(description: 'data', type: 'mixed', example: '123')]
+        private readonly mixed $data,
+        #[Property(description: 'type', type: 'string', example: 'document')]
+        private readonly string $type,
+        #[Property(description: 'inheritable', type: 'boolean', example: false)]
+        private readonly bool $inheritable,
+        #[Property(description: 'inherited', type: 'boolean', example: false)]
+        private readonly bool $inherited,
+        #[Property(description: 'config', type: 'string', example: 'comma,separated,values')]
+        private readonly ?string $config,
+        #[Property(description: 'predefinedName', type: 'string', example: 'name of the predefined property')]
+        private readonly ?string $predefinedName,
+        #[Property(description: 'description', type: 'string', example: 'Description of the predefined property')]
+        private readonly ?string $description,
+    ) {
+    }
+
+    public function getKey(): string
+    {
+        return $this->key;
+    }
+
+    public function getData(): mixed
+    {
+        return $this->data;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function isInheritable(): bool
+    {
+        return $this->inheritable;
+    }
+
+    public function isInherited(): bool
+    {
+        return $this->inherited;
+    }
+
+    public function getConfig(): ?string
+    {
+        return $this->config;
+    }
+
+    public function getPredefinedName(): ?string
+    {
+        return $this->predefinedName;
+    }
+
+    public function getDescription(): ?string
+    {
+        return $this->description;
+    }
+}
diff --git a/src/Property/Schema/PredefinedProperty.php b/src/Property/Schema/PredefinedProperty.php
new file mode 100644
index 000000000..2064f014c
--- /dev/null
+++ b/src/Property/Schema/PredefinedProperty.php
@@ -0,0 +1,115 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Schema;
+
+use OpenApi\Attributes\Property;
+use OpenApi\Attributes\Schema;
+use Pimcore\Bundle\StudioBackendBundle\Util\Schema\AdditionalAttributesInterface;
+use Pimcore\Bundle\StudioBackendBundle\Util\Traits\AdditionalAttributesTrait;
+
+/**
+ * @internal
+ */
+#[Schema(
+    title: 'PredefinedProperty',
+    type: 'object'
+)]
+final class PredefinedProperty implements AdditionalAttributesInterface
+{
+    use AdditionalAttributesTrait;
+
+    public function __construct(
+        #[Property(description: 'id', type: 'string', example: 'alpha-numerical-value')]
+        private readonly string $id,
+        #[Property(description: 'name', type: 'string', example: 'Mister Proper')]
+        private readonly string $name,
+        #[Property(description: 'description', type: 'string', example: 'Detailed description of the property')]
+        private readonly ?string $description,
+        #[Property(description: 'key', type: 'string', example: 'Key for referencing')]
+        private readonly string $key,
+        #[Property(description: 'type', type: 'string', example: 'text')]
+        private readonly string $type,
+        #[Property(description: 'data', type: 'string', example: 'test')]
+        private readonly ?string $data,
+        #[Property(description: 'config', type: 'string', example: 'comma,separated,values')]
+        private readonly ?string $config,
+        #[Property(description: 'ctype', type: 'string', example: 'document')]
+        private readonly string $ctype,
+        #[Property(description: 'inheritable', type: 'boolean', example: false)]
+        private readonly bool $inheritable,
+        #[Property(description: 'Creation date', type: 'integer', example: 221846400)]
+        private readonly int $creationDate,
+        #[Property(description: 'Modification date', type: 'integer', example: 327417600)]
+        private readonly int $modificationDate,
+    ) {
+    }
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getDescription(): ?string
+    {
+        return $this->description;
+    }
+
+    public function getKey(): string
+    {
+        return $this->key;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function getData(): ?string
+    {
+        return $this->data;
+    }
+
+    public function getConfig(): ?string
+    {
+        return $this->config;
+    }
+
+    public function getCtype(): string
+    {
+        return $this->ctype;
+    }
+
+    public function isInheritable(): bool
+    {
+        return $this->inheritable;
+    }
+
+    public function getCreationDate(): int
+    {
+        return $this->creationDate;
+    }
+
+    public function getModificationDate(): int
+    {
+        return $this->modificationDate;
+    }
+}
diff --git a/src/Property/Schema/UpdateElementProperty.php b/src/Property/Schema/UpdateElementProperty.php
new file mode 100644
index 000000000..1895bf047
--- /dev/null
+++ b/src/Property/Schema/UpdateElementProperty.php
@@ -0,0 +1,62 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Schema;
+
+use OpenApi\Attributes\Property;
+use OpenApi\Attributes\Schema;
+
+/**
+ * @internal
+ */
+#[Schema(
+    title: 'UpdateDataProperty',
+    type: 'object'
+)]
+final readonly class UpdateElementProperty
+{
+    public function __construct(
+        #[Property(description: 'key', type: 'string', example: 'Mister Proper')]
+        private string $key,
+        #[Property(description: 'data', type: 'mixed', example: '123')]
+        private mixed $data,
+        #[Property(description: 'type', type: 'string', example: 'document')]
+        private string $type,
+        #[Property(description: 'inheritable', type: 'boolean', example: false)]
+        private bool $inheritable,
+    ) {
+    }
+
+    public function getKey(): string
+    {
+        return $this->key;
+    }
+
+    public function getData(): mixed
+    {
+        return $this->data;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function getInheritable(): bool
+    {
+        return $this->inheritable;
+    }
+}
diff --git a/src/Property/Schema/UpdatePredefinedProperty.php b/src/Property/Schema/UpdatePredefinedProperty.php
new file mode 100644
index 000000000..8b5df22bc
--- /dev/null
+++ b/src/Property/Schema/UpdatePredefinedProperty.php
@@ -0,0 +1,90 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Schema;
+
+use OpenApi\Attributes\Property;
+use OpenApi\Attributes\Schema;
+
+/**
+ * @internal
+ */
+#[Schema(
+    title: 'UpdatePredefinedProperty',
+    type: 'object'
+)]
+final readonly class UpdatePredefinedProperty
+{
+    public function __construct(
+        #[Property(description: 'name', type: 'string', example: 'Mister Proper')]
+        private string $name,
+        #[Property(description: 'description', type: 'string', example: 'Detailed description of the property')]
+        private ?string $description,
+        #[Property(description: 'key', type: 'string', example: 'Key for referencing')]
+        private string $key,
+        #[Property(description: 'type', type: 'string', example: 'text')]
+        private string $type,
+        #[Property(description: 'data', type: 'string', example: 'test')]
+        private ?string $data,
+        #[Property(description: 'config', type: 'string', example: 'comma,separated,values')]
+        private ?string $config,
+        #[Property(description: 'ctype', type: 'string', example: 'document')]
+        private string $ctype,
+        #[Property(description: 'inheritable', type: 'bool', example: false)]
+        private bool $inheritable,
+    ) {
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getDescription(): ?string
+    {
+        return $this->description;
+    }
+
+    public function getKey(): string
+    {
+        return $this->key;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function getData(): ?string
+    {
+        return $this->data;
+    }
+
+    public function getConfig(): ?string
+    {
+        return $this->config;
+    }
+
+    public function getCtype(): string
+    {
+        return $this->ctype;
+    }
+
+    public function isInheritable(): bool
+    {
+        return $this->inheritable;
+    }
+}
diff --git a/src/Property/Service/PropertyService.php b/src/Property/Service/PropertyService.php
new file mode 100644
index 000000000..2427a3922
--- /dev/null
+++ b/src/Property/Service/PropertyService.php
@@ -0,0 +1,133 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Service;
+
+use Pimcore\Bundle\StaticResolverBundle\Models\Element\ServiceResolverInterface;
+use Pimcore\Bundle\StudioBackendBundle\Exception\PropertyNotFoundException;
+use Pimcore\Bundle\StudioBackendBundle\Property\Event\ElementPropertyEvent;
+use Pimcore\Bundle\StudioBackendBundle\Property\Event\PredefinedPropertyEvent;
+use Pimcore\Bundle\StudioBackendBundle\Property\Hydrator\PropertyHydratorInterface;
+use Pimcore\Bundle\StudioBackendBundle\Property\Repository\PropertyRepositoryInterface;
+use Pimcore\Bundle\StudioBackendBundle\Property\Request\PropertiesParameters;
+use Pimcore\Bundle\StudioBackendBundle\Property\Request\UpdateElementProperties;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\ElementProperty;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\PredefinedProperty;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\UpdatePredefinedProperty;
+use Pimcore\Bundle\StudioBackendBundle\Util\Traits\ElementProviderTrait;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
+/**
+ * @internal
+ */
+final readonly class PropertyService implements PropertyServiceInterface
+{
+    use ElementProviderTrait;
+
+    public function __construct(
+        private PropertyRepositoryInterface $propertyRepository,
+        private PropertyHydratorInterface $propertyHydrator,
+        private ServiceResolverInterface $serviceResolver,
+        private EventDispatcherInterface $eventDispatcher
+    ) {
+    }
+
+    public function createPredefinedProperty(): PredefinedProperty
+    {
+        $predefined = $this->propertyRepository->createPredefinedProperty();
+        return $this->getPredefinedProperty($predefined->getId());
+    }
+
+    public function getPredefinedProperty(string $id): PredefinedProperty
+    {
+        $predefinedProperty = $this->propertyHydrator->hydratePredefinedProperty(
+            $this->propertyRepository->getPredefinedProperty($id)
+        );
+
+        $this->eventDispatcher->dispatch(
+            new PredefinedPropertyEvent($predefinedProperty),
+            PredefinedPropertyEvent::EVENT_NAME
+        );
+
+        return $predefinedProperty;
+    }
+
+    /**
+     * @return array<int, PredefinedProperty>
+     */
+    public function getPredefinedProperties(PropertiesParameters $parameters): array
+    {
+        $properties = $this->propertyRepository->listProperties($parameters);
+        $hydratedProperties = [];
+        foreach ($properties->load() as $property) {
+
+            $predefinedProperty = $this->propertyHydrator->hydratePredefinedProperty($property);
+
+            $this->eventDispatcher->dispatch(
+                new PredefinedPropertyEvent($predefinedProperty),
+                PredefinedPropertyEvent::EVENT_NAME
+            );
+
+            $hydratedProperties[] = $predefinedProperty;
+        }
+        return $hydratedProperties;
+    }
+
+    /**
+     * @return array<int, ElementProperty>
+     */
+    public function getElementProperties(string $elementType, int $id): array
+    {
+        $element = $this->getElement($this->serviceResolver, $elementType, $id);
+
+        $hydratedProperties = [];
+
+        foreach($element->getProperties() as $property) {
+
+            $elementProperty = $this->propertyHydrator->hydrateElementProperty($property);
+
+            $this->eventDispatcher->dispatch(
+                new ElementPropertyEvent($elementProperty),
+                ElementPropertyEvent::EVENT_NAME
+            );
+
+            $hydratedProperties[] = $elementProperty;
+        }
+
+        return $hydratedProperties;
+    }
+
+    /**
+     * @throws PropertyNotFoundException
+     */
+    public function updatePredefinedProperty(string $id, UpdatePredefinedProperty $property): void
+    {
+        $this->propertyRepository->updatePredefinedProperty($id, $property);
+    }
+
+    public function updateElementProperties(string $elementType, int $id, UpdateElementProperties $items): void
+    {
+        $this->propertyRepository->updateElementProperties($elementType, $id, $items);
+    }
+
+    /**
+     * @throws PropertyNotFoundException
+     */
+    public function deletePredefinedProperty(string $id): void
+    {
+        $this->propertyRepository->deletePredefinedProperty($id);
+    }
+}
diff --git a/src/Property/Service/PropertyServiceInterface.php b/src/Property/Service/PropertyServiceInterface.php
new file mode 100644
index 000000000..f751619ce
--- /dev/null
+++ b/src/Property/Service/PropertyServiceInterface.php
@@ -0,0 +1,56 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Property\Service;
+
+use Pimcore\Bundle\StudioBackendBundle\Exception\PropertyNotFoundException;
+use Pimcore\Bundle\StudioBackendBundle\Property\Request\PropertiesParameters;
+use Pimcore\Bundle\StudioBackendBundle\Property\Request\UpdateElementProperties;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\ElementProperty;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\PredefinedProperty;
+use Pimcore\Bundle\StudioBackendBundle\Property\Schema\UpdatePredefinedProperty;
+
+/**
+ * @internal
+ */
+interface PropertyServiceInterface
+{
+    public function createPredefinedProperty(): PredefinedProperty;
+
+    public function getPredefinedProperty(string $id): PredefinedProperty;
+
+    /**
+     * @return array<int, PredefinedProperty>
+     */
+    public function getPredefinedProperties(PropertiesParameters $parameters): array;
+
+    /**
+     * @return array<int, ElementProperty>
+     */
+    public function getElementProperties(string $elementType, int $id): array;
+
+    /**
+     * @throws PropertyNotFoundException
+     */
+    public function updatePredefinedProperty(string $id, UpdatePredefinedProperty $property): void;
+
+    public function updateElementProperties(string $elementType, int $id, UpdateElementProperties $items): void;
+
+    /**
+     * @throws PropertyNotFoundException
+     */
+    public function deletePredefinedProperty(string $id): void;
+}
diff --git a/src/Util/Schema/AdditionalAttributesInterface.php b/src/Util/Schema/AdditionalAttributesInterface.php
new file mode 100644
index 000000000..db43be714
--- /dev/null
+++ b/src/Util/Schema/AdditionalAttributesInterface.php
@@ -0,0 +1,31 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Util\Schema;
+
+/**
+ * @internal
+ */
+interface AdditionalAttributesInterface
+{
+    public function hasAdditionalAttribute(string $key): bool;
+
+    public function getAdditionalAttribute(string $key): mixed;
+
+    public function addAdditionalAttribute(string $key, mixed $value): void;
+
+    public function removeAdditionalAttribute(string $key): void;
+}
diff --git a/src/Util/Traits/AdditionalAttributesTrait.php b/src/Util/Traits/AdditionalAttributesTrait.php
new file mode 100644
index 000000000..2e33a6947
--- /dev/null
+++ b/src/Util/Traits/AdditionalAttributesTrait.php
@@ -0,0 +1,68 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Util\Traits;
+
+use OpenApi\Attributes\AdditionalProperties;
+use OpenApi\Attributes\Items;
+use OpenApi\Attributes\Property;
+use OpenApi\Attributes\Schema;
+
+/**
+ * @internal
+ */
+trait AdditionalAttributesTrait
+{
+    #[Property(
+        description: 'AdditionalAttributes',
+        type: 'object',
+        additionalProperties: new AdditionalProperties(
+            anyOf: [
+                new Schema(type: 'string'),
+                new Schema(type: 'number'),
+                new Schema(type: 'boolean'),
+                new Schema(type: 'object'),
+                new Schema(type: 'array', items: new Items()),
+            ]
+        )
+    )]
+    private array $additionalAttributes = [];
+
+    public function hasAdditionalAttribute(string $key): bool
+    {
+        return array_key_exists($key, $this->additionalAttributes);
+    }
+
+    public function getAdditionalAttributes(): array
+    {
+        return $this->additionalAttributes;
+    }
+
+    public function getAdditionalAttribute(string $key): mixed
+    {
+        return $this->additionalAttributes[$key] ?? null;
+    }
+
+    public function addAdditionalAttribute(string $key, mixed $value): void
+    {
+        $this->additionalAttributes[$key] = $value;
+    }
+
+    public function removeAdditionalAttribute(string $key): void
+    {
+        unset($this->additionalAttributes[$key]);
+    }
+}
diff --git a/src/Util/Traits/ElementProviderTrait.php b/src/Util/Traits/ElementProviderTrait.php
index e16e6df30..193eefc59 100644
--- a/src/Util/Traits/ElementProviderTrait.php
+++ b/src/Util/Traits/ElementProviderTrait.php
@@ -38,19 +38,18 @@ trait ElementProviderTrait
     private function getElement(
         ServiceResolverInterface $serviceResolver,
         string $type,
-        int $id,
-        ?UserInterface $user = null,
+        int $id
     ): ElementInterface {
         $element = $serviceResolver->getElementById($type, $id);
         if ($element === null) {
             throw new ElementNotFoundException($id);
         }
 
-        return $this->getLatestVersionForUser($element, $user);
+        return $element;
     }
 
     private function getLatestVersionForUser(
-        Asset|Document|Concrete $element,
+        Asset|Document\PageSnippet|Concrete $element,
         ?UserInterface $user
     ): ElementInterface {
         // check for latest version
diff --git a/tests/Unit/Asset/Encoder/EncoderTest.php b/tests/Unit/Asset/Encoder/EncoderTest.php
new file mode 100644
index 000000000..24e8cc761
--- /dev/null
+++ b/tests/Unit/Asset/Encoder/EncoderTest.php
@@ -0,0 +1,71 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Tests\Unit\Asset\Encoder;
+
+use Codeception\Test\Unit;
+use Exception;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Encoder\TextEncoder;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Encoder\TextEncoderInterface;
+use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidElementTypeException;
+use Pimcore\Bundle\StudioBackendBundle\Exception\MaxFileSizeExceededException;
+use Pimcore\Model\Asset\Document;
+use Pimcore\Model\Asset\Text;
+
+/**
+ * @internal
+ */
+final class EncoderTest extends Unit
+{
+    private TextEncoderInterface $encoder;
+
+    public function _before(): void
+    {
+        $this->encoder = new TextEncoder();
+    }
+
+    public function testWrongElementType(): void
+    {
+        $element = new Document();
+
+        $this->expectException(InvalidElementTypeException::class);
+
+        $this->encoder->encodeUTF8($element);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testFileSizeExceeded(): void
+    {
+        $element = $this->makeEmpty(Text::class, ['getFileSize' => 2000001]);
+
+        $this->expectException(MaxFileSizeExceededException::class);
+
+        $this->encoder->encodeUTF8($element);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testUTF8Encoding(): void
+    {
+        $element = $this->makeEmpty(Text::class, ['getData' => 'Héllö, 世界!']);
+        $encodedData = $this->encoder->encodeUTF8($element);
+
+        $this->assertTrue(mb_check_encoding($encodedData, 'UTF-8'));
+    }
+}
diff --git a/tests/Unit/Property/PropertyHydratorTest.php b/tests/Unit/Property/PropertyHydratorTest.php
new file mode 100644
index 000000000..45b8a05b9
--- /dev/null
+++ b/tests/Unit/Property/PropertyHydratorTest.php
@@ -0,0 +1,134 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Tests\Unit\Property;
+
+use Codeception\Test\Unit;
+use Exception;
+use Pimcore\Bundle\StaticResolverBundle\Models\Predefined\PredefinedResolverInterface;
+use Pimcore\Bundle\StudioBackendBundle\Property\Hydrator\PropertyHydrator;
+use Pimcore\Bundle\StudioBackendBundle\Property\Hydrator\PropertyHydratorInterface;
+use Pimcore\Bundle\StudioBackendBundle\Util\Constants\ElementTypes;
+use Pimcore\Model\Document;
+use Pimcore\Model\Property;
+use Pimcore\Model\Property\Predefined;
+
+final class PropertyHydratorTest extends Unit
+{
+    /**
+     * @throws Exception
+     */
+    public function testHydratePredefined(): void
+    {
+        $hydrator = $this->getHydrator();
+
+        $data = $hydrator->hydratePredefinedProperty($this->getPredefined());
+
+        $this->assertSame('new_id', $data->getId());
+        $this->assertSame(ElementTypes::TYPE_DOCUMENT, $data->getCtype());
+        $this->assertSame('New Property', $data->getName());
+        $this->assertSame('new_key', $data->getKey());
+        $this->assertSame('text', $data->getType());
+        $this->assertTrue($data->isInheritable());
+        $this->assertSame('New Description', $data->getDescription());
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testHydrateElementProperties(): void
+    {
+        $hydrator = $this->getHydrator();
+        $data = $hydrator->hydrateElementProperty($this->getElementProperty());
+
+        $this->assertSame('New Property', $data->getPredefinedName());
+        $this->assertSame('text', $data->getType());
+        $this->assertTrue($data->isInheritable());
+        $this->assertTrue($data->isInherited());
+        $this->assertNull($data->getConfig());
+
+        $this->assertIsArray($data->getData());
+        $this->assertArrayHasKey('path', $data->getData());
+        $this->assertArrayHasKey('id', $data->getData());
+        $this->assertArrayHasKey('type', $data->getData());
+        $this->assertArrayHasKey('key', $data->getData());
+
+        $this->assertSame('/test', $data->getData()['path']);
+        $this->assertSame(1, $data->getData()['id']);
+        $this->assertSame('page', $data->getData()['type']);
+        $this->assertSame('test', $data->getData()['key']);
+    }
+
+    /**
+     * @throws Exception
+     */
+    private function getHydrator(): PropertyHydratorInterface
+    {
+        return new PropertyHydrator($this->mockPredefinedResolver());
+    }
+
+    /**
+     * @throws Exception
+     */
+    private function mockPredefinedResolver(): PredefinedResolverInterface
+    {
+        return $this->makeEmpty(PredefinedResolverInterface::class,
+        [
+            'getById' => $this->getPredefined(),
+            'getByKey' => $this->getPredefined(),
+        ]);
+    }
+
+    private function getPredefined(): Predefined
+    {
+        $property = new Predefined();
+        $property->setId('new_id');
+        $property->setCtype(ElementTypes::TYPE_DOCUMENT);
+        $property->setName('New Property');
+        $property->setKey('new_key');
+        $property->setType('text');
+        $property->setCreationDate(time());
+        $property->setModificationDate(time());
+        $property->setInheritable(true);
+        $property->setDescription('New Description');
+
+        return $property;
+    }
+
+    private function getElementProperty(): Property
+    {
+        $property =  new Property();
+        $property->setDataFromResource($this->getDocument());
+        $property->setName('New Property');
+        $property->setType('text');
+        $property->setCtype('document');
+        $property->setInheritable(true);
+        $property->setInherited(true);
+
+        return $property;
+    }
+
+    private function getDocument(): Document
+    {
+        $document = new Document();
+        $document->setPath('/test');
+        $document->setId(1);
+        $document->setType('page');
+        $document->setKey('test');
+
+        return $document;
+    }
+}