diff --git a/.gitignore b/.gitignore
index c9e0d7fa..729abfc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -147,6 +147,7 @@ fabric.properties
 /lib/RoadizFontBundle
 /lib/Rozier
 /lib/Models
+/lib/Documents
 /themes/BaseTheme
 /public/themes/BaseTheme
 /public/assets/*
diff --git a/README.md b/README.md
index db6a6514..e08670f8 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ This is development app for Roadiz v2.x. It aggregate all Roadiz bundle and main
 - Clone roadiz/font-bundle in `lib/RoadizFontBundle` directory
 - Clone roadiz/rozier in `lib/Rozier` directory
 - Clone roadiz/models in `lib/Models` directory
+- Clone roadiz/documents in `lib/Documents` directory
 
 ### Generate JWT private and public keys
 
diff --git a/composer.json b/composer.json
index c0c8463b..1868efcf 100644
--- a/composer.json
+++ b/composer.json
@@ -75,6 +75,7 @@
         "twig/twig": "^2.12|^3.0"
     },
     "require-dev": {
+        "enshrined/svg-sanitize": "^0.15",
         "php-coveralls/php-coveralls": "^2.4",
         "phpoffice/phpspreadsheet": "^1.15",
         "phpstan/phpstan": "^1.5.3",
@@ -122,8 +123,20 @@
         "psr-4": {
             "App\\": "src/",
             "RZ\\Roadiz\\Bag\\": "lib/Models/src/Roadiz/Bag/",
-            "RZ\\Roadiz\\Core\\": "lib/Models/src/Roadiz/Core/",
-            "RZ\\Roadiz\\Utils\\": "lib/Models/src/Roadiz/Utils/",
+            "RZ\\Roadiz\\Core\\": [
+                "lib/Models/src/Roadiz/Core/",
+                "lib/Documents/src/Roadiz/Core/"
+            ],
+            "RZ\\Roadiz\\Utils\\": [
+                "lib/Models/src/Roadiz/Utils/",
+                "lib/Documents/src/Roadiz/Utils/"
+            ],
+            "RZ\\Roadiz\\TwigExtension\\": [
+                "lib/Documents/src/Roadiz/TwigExtension/"
+            ],
+            "RZ\\Roadiz\\Document\\": [
+                "lib/Documents/src/Roadiz/Document/"
+            ],
             "RZ\\Roadiz\\CoreBundle\\": "lib/RoadizCoreBundle/src/",
             "RZ\\Roadiz\\CompatBundle\\": "lib/RoadizCompatBundle/src/",
             "RZ\\Roadiz\\RozierBundle\\": "lib/RoadizRozierBundle/src/",
@@ -153,7 +166,8 @@
         "roadiz/font-bundle": "*",
         "roadiz/user-bundle": "*",
         "roadiz/rozier": "*",
-        "roadiz/models": "*"
+        "roadiz/models": "*",
+        "roadiz/documents": "*"
     },
     "scripts": {
         "auto-scripts": {
diff --git a/config/packages/roadiz_core.yaml b/config/packages/roadiz_core.yaml
index 73c7bea8..31390681 100644
--- a/config/packages/roadiz_core.yaml
+++ b/config/packages/roadiz_core.yaml
@@ -3,6 +3,7 @@ roadiz_core:
     appVersion: '%env(string:APP_VERSION)%'
     healthCheckToken: '%env(string:APP_HEALTH_CHECK_TOKEN)%'
     staticDomainName: ~
+    documentsLibDir: 'lib/Documents/src'
     useNativeJsonColumnType: true
     security:
         private_key_name: default