diff --git a/src/Resources/config/serializer/Entity.Media.xml b/src/Resources/config/serializer/Entity.Media.xml
deleted file mode 100644
index be21b5d14..000000000
--- a/src/Resources/config/serializer/Entity.Media.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<serialization>
-    <class name="BitBag\SyliusCmsPlugin\Entity\Media" exclusion-policy="ALL" xml-root-name="media">
-        <property name="id" expose="true" type="integer" xml-attribute="true">
-            <groups>Autocomplete</groups>
-        </property>
-        <property name="code" expose="true" type="string">
-            <groups>Autocomplete</groups>
-        </property>
-        <property name="path" expose="true" type="string">
-            <groups>Autocomplete</groups>
-        </property>
-        <relation rel="self">
-            <href>
-                <route>bitbag_sylius_cms_plugin_shop_media_inline</route>
-                <parameters>
-                    <_locale>expr(object.getTranslation().getLocale())</_locale>
-                    <code>expr(object.getCode())</code>
-                </parameters>
-            </href>
-        </relation>
-        <virtual-property name="getName" serialized-name="name">
-            <groups>Autocomplete</groups>
-        </virtual-property>
-    </class>
-</serialization>
diff --git a/src/Resources/config/serializer/Entity.Media.yml b/src/Resources/config/serializer/Entity.Media.yml
new file mode 100644
index 000000000..8cf3defd2
--- /dev/null
+++ b/src/Resources/config/serializer/Entity.Media.yml
@@ -0,0 +1,29 @@
+BitBag\SyliusCmsPlugin\Entity\Media:
+    exclusion_policy: ALL
+    xml_root_name: media
+    properties:
+        id:
+            expose: true
+            type: integer
+            xml_attribute: true
+            groups: [Autocomplete]
+        code:
+            expose: true
+            type: string
+            groups: [Autocomplete]
+        path:
+            expose: true
+            type: string
+            groups: [Autocomplete]
+    relations:
+        -
+            rel: self
+            href:
+                route: bitbag_sylius_cms_plugin_shop_media_inline
+                parameters:
+                    _locale: expr(object.getTranslation().getLocale())
+                    code: expr(object.getCode())
+    virtual_properties:
+        getName:
+            serialized_name: name
+            groups: [Autocomplete]
diff --git a/src/Resources/config/serializer/Entity.Section.xml b/src/Resources/config/serializer/Entity.Section.xml
deleted file mode 100644
index 2febf74cc..000000000
--- a/src/Resources/config/serializer/Entity.Section.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<serialization>
-    <class name="BitBag\SyliusCmsPlugin\Entity\Section" exclusion-policy="ALL" xml-root-name="section">
-        <property name="id" expose="true" type="integer" xml-attribute="true">
-            <groups>Autocomplete</groups>
-        </property>
-        <property name="code" expose="true" type="string">
-            <groups>Autocomplete</groups>
-        </property>
-        <virtual-property name="getName" serialized-name="name">
-            <groups>Autocomplete</groups>
-        </virtual-property>
-    </class>
-</serialization>
diff --git a/src/Resources/config/serializer/Entity.Section.yml b/src/Resources/config/serializer/Entity.Section.yml
new file mode 100644
index 000000000..96a51ea3d
--- /dev/null
+++ b/src/Resources/config/serializer/Entity.Section.yml
@@ -0,0 +1,17 @@
+BitBag\SyliusCmsPlugin\Entity\Section:
+    exclusion_policy: ALL
+    xml_root_name: section
+    properties:
+        id:
+            expose: true
+            type: integer
+            xml_attribute: true
+            groups: [Autocomplete]
+        code:
+            expose: true
+            type: string
+            groups: [Autocomplete]
+    virtual_properties:
+        getName:
+            serialized_name: name
+            groups: [Autocomplete]
diff --git a/src/Resources/config/validation/Block.xml b/src/Resources/config/validation/Block.xml
new file mode 100644
index 000000000..26e369571
--- /dev/null
+++ b/src/Resources/config/validation/Block.xml
@@ -0,0 +1,46 @@
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+    http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+    <class name="BitBag\SyliusCmsPlugin\Entity\Block">
+        <constraint name="Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity">
+            <option name="fields">
+                <value>code</value>
+            </option>
+            <option name="groups">
+                <value>bitbag</value>
+            </option>
+            <option name="message">bitbag_sylius_cms_plugin.block.code.unique</option>
+        </constraint>
+
+        <property name="code">
+            <constraint name="NotBlank">
+                <option name="message">bitbag_sylius_cms_plugin.block.code.not_blank</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">250</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.block.code.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.block.code.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Regex">
+                <option name="pattern">/^[\w-]*$/</option>
+                <option name="message">bitbag_sylius_cms_plugin.block.code.regex</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="translations">
+            <constraint name="Valid"/>
+        </property>
+    </class>
+</constraint-mapping>
diff --git a/src/Resources/config/validation/BlockTranslation.xml b/src/Resources/config/validation/BlockTranslation.xml
new file mode 100644
index 000000000..bd3e547f1
--- /dev/null
+++ b/src/Resources/config/validation/BlockTranslation.xml
@@ -0,0 +1,41 @@
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+    http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+    <class name="BitBag\SyliusCmsPlugin\Entity\BlockTranslation">
+        <property name="name">
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">250</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.block.name.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.block.name.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="link">
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">250</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.block.link.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.block.link.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="content">
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.block.content.min_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+    </class>
+</constraint-mapping>
diff --git a/src/Resources/config/validation/FrequentlyAskedQuestion.xml b/src/Resources/config/validation/FrequentlyAskedQuestion.xml
new file mode 100644
index 000000000..ead67ad2c
--- /dev/null
+++ b/src/Resources/config/validation/FrequentlyAskedQuestion.xml
@@ -0,0 +1,62 @@
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+    http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+    <class name="BitBag\SyliusCmsPlugin\Entity\FrequentlyAskedQuestion">
+        <constraint name="Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity">
+            <option name="fields">
+                <value>position</value>
+            </option>
+            <option name="message">bitbag_sylius_cms_plugin.frequently_asked_question.position.unique</option>
+            <option name="groups">
+                <value>bitbag</value>
+            </option>
+        </constraint>
+        <constraint name="Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity">
+            <option name="fields">
+                <value>code</value>
+            </option>
+            <option name="message">bitbag_sylius_cms_plugin.frequently_asked_question.code.unique</option>
+            <option name="groups">
+                <value>bitbag</value>
+            </option>
+        </constraint>
+
+        <property name="code">
+            <constraint name="NotBlank">
+                <option name="message">bitbag_sylius_cms_plugin.frequently_asked_question.code.not_blank</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.frequently_asked_question.code.min_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Regex">
+                <option name="pattern">/^[\w-]*$/</option>
+                <option name="message">bitbag_sylius_cms_plugin.frequently_asked_question.code.regex</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="position">
+            <constraint name="NotBlank">
+                <option name="message">bitbag_sylius_cms_plugin.frequently_asked_question.position.not_blank</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="translations">
+            <constraint name="Valid"/>
+        </property>
+    </class>
+</constraint-mapping>
diff --git a/src/Resources/config/validation/FrequentlyAskedQuestionTranslation.xml b/src/Resources/config/validation/FrequentlyAskedQuestionTranslation.xml
new file mode 100644
index 000000000..8bc83fdcf
--- /dev/null
+++ b/src/Resources/config/validation/FrequentlyAskedQuestionTranslation.xml
@@ -0,0 +1,39 @@
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+    http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+    <class name="BitBag\SyliusCmsPlugin\Entity\FrequentlyAskedQuestionTranslation">
+        <property name="question">
+            <constraint name="NotBlank">
+                <option name="message">bitbag_sylius_cms_plugin.frequently_asked_question.question.not_blank</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.frequently_asked_question.question.min_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="answer">
+            <constraint name="NotBlank">
+                <option name="message">bitbag_sylius_cms_plugin.frequently_asked_question.answer.not_blank</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.frequently_asked_question.answer.min_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+    </class>
+</constraint-mapping>
diff --git a/src/Resources/config/validation/Media.xml b/src/Resources/config/validation/Media.xml
new file mode 100644
index 000000000..e7c2f4e1e
--- /dev/null
+++ b/src/Resources/config/validation/Media.xml
@@ -0,0 +1,68 @@
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+    http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+    <class name="BitBag\SyliusCmsPlugin\Entity\Media">
+        <constraint name="Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity">
+            <option name="fields">
+                <value>code</value>
+            </option>
+            <option name="groups">
+                <value>bitbag</value>
+            </option>
+            <option name="message">bitbag_sylius_cms_plugin.media.code.unique</option>
+        </constraint>
+        <constraint name="BitBag\SyliusCmsPlugin\Validator\Constraint\FileMatchesType">
+            <option name="groups">
+                <value>bitbag</value>
+            </option>
+            <option name="messageImage">bitbag_sylius_cms_plugin.media.file.type_image</option>
+            <option name="messageVideo">bitbag_sylius_cms_plugin.media.file.type_video</option>
+            <option name="field">type</option>
+        </constraint>
+
+        <property name="code">
+            <constraint name="NotBlank">
+                <option name="message">bitbag_sylius_cms_plugin.media.code.not_blank</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">250</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.media.code.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.media.code.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Regex">
+                <option name="pattern">/^[\w-]*$/</option>
+                <option name="message">bitbag_sylius_cms_plugin.media.code.regex</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="file">
+            <constraint name="Expression">
+                <option name="expression">!(this.getPath() == null and this.getFile() == null)</option>
+                <option name="message">bitbag_sylius_cms_plugin.media.file.not_blank</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="translations">
+            <constraint name="Valid">
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+    </class>
+</constraint-mapping>
diff --git a/src/Resources/config/validation/MediaTranslation.xml b/src/Resources/config/validation/MediaTranslation.xml
new file mode 100644
index 000000000..1e3495124
--- /dev/null
+++ b/src/Resources/config/validation/MediaTranslation.xml
@@ -0,0 +1,54 @@
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+    http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+    <class name="BitBag\SyliusCmsPlugin\Entity\MediaTranslation">
+        <property name="name">
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">250</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.media.name.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.media.name.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="alt">
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">250</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.media.alt.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.media.alt.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="link">
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">250</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.media.link.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.media.link.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="content">
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.media.content.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.media.content.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+    </class>
+</constraint-mapping>
diff --git a/src/Resources/config/validation/Page.xml b/src/Resources/config/validation/Page.xml
new file mode 100644
index 000000000..5cf0e3316
--- /dev/null
+++ b/src/Resources/config/validation/Page.xml
@@ -0,0 +1,46 @@
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+    http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+    <class name="BitBag\SyliusCmsPlugin\Entity\Page">
+        <constraint name="Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity">
+            <option name="fields">
+                <value>code</value>
+            </option>
+            <option name="message">bitbag_sylius_cms_plugin.page.code.unique</option>
+            <option name="groups">
+                <value>bitbag</value>
+            </option>
+        </constraint>
+
+        <property name="code">
+            <constraint name="NotBlank">
+                <option name="message">bitbag_sylius_cms_plugin.page.code.not_blank</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">250</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.page.code.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.page.code.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Regex">
+                <option name="pattern">/^[\w-]*$/</option>
+                <option name="message">bitbag_sylius_cms_plugin.page.code.regex</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="translations">
+            <constraint name="Valid" />
+        </property>
+    </class>
+</constraint-mapping>
diff --git a/src/Resources/config/validation/PageTranslation.xml b/src/Resources/config/validation/PageTranslation.xml
new file mode 100644
index 000000000..cd4f86842
--- /dev/null
+++ b/src/Resources/config/validation/PageTranslation.xml
@@ -0,0 +1,95 @@
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+    http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+    <class name="BitBag\SyliusCmsPlugin\Entity\PageTranslation">
+        <constraint name="Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity">
+            <option name="fields">
+                <value>slug</value>
+                <value>locale</value>
+            </option>
+            <option name="errorPath">slug</option>
+            <option name="groups">
+                <value>bitbag</value>
+            </option>
+            <option name="message">bitbag_sylius_cms_plugin.page.slug.unique</option>
+        </constraint>
+
+        <property name="name">
+            <constraint name="NotBlank">
+                <option name="message">bitbag_sylius_cms_plugin.page.name.not_blank</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">250</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.page.name.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.page.name.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="slug">
+            <constraint name="NotBlank">
+                <option name="message">bitbag_sylius_cms_plugin.page.slug.not_blank</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">250</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.page.slug.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.page.slug.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="metaKeywords">
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">1000</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.page.meta_keywords.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.page.meta_keywords.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="metaDescription">
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">5000</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.page.meta_description.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.page.meta_description.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="content">
+            <constraint name="NotBlank">
+                <option name="message">bitbag_sylius_cms_plugin.page.content.not_blank</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.page.content.min_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+    </class>
+</constraint-mapping>
diff --git a/src/Resources/config/validation/Section.xml b/src/Resources/config/validation/Section.xml
new file mode 100644
index 000000000..a9034efda
--- /dev/null
+++ b/src/Resources/config/validation/Section.xml
@@ -0,0 +1,46 @@
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+    http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+    <class name="BitBag\SyliusCmsPlugin\Entity\Section">
+        <constraint name="Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity">
+            <option name="fields">
+                <value>code</value>
+            </option>
+            <option name="message">bitbag_sylius_cms_plugin.section.code.unique</option>
+            <option name="groups">
+                <value>bitbag</value>
+            </option>
+        </constraint>
+
+        <property name="code">
+            <constraint name="NotBlank">
+                <option name="message">bitbag_sylius_cms_plugin.section.code.not_blank</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">250</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.section.code.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.section.code.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Regex">
+                <option name="pattern">/^[\w-]*$/</option>
+                <option name="message">bitbag_sylius_cms_plugin.section.code.regex</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+
+        <property name="translations">
+            <constraint name="Valid"/>
+        </property>
+    </class>
+</constraint-mapping>
diff --git a/src/Resources/config/validation/SectionTranslation.xml b/src/Resources/config/validation/SectionTranslation.xml
new file mode 100644
index 000000000..4c1bd58cc
--- /dev/null
+++ b/src/Resources/config/validation/SectionTranslation.xml
@@ -0,0 +1,25 @@
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+    http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+    <class name="BitBag\SyliusCmsPlugin\Entity\SectionTranslation">
+        <property name="name">
+            <constraint name="NotBlank">
+                <option name="message">bitbag_sylius_cms_plugin.section.name.not_blank</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="max">250</option>
+                <option name="minMessage">bitbag_sylius_cms_plugin.section.name.min_length</option>
+                <option name="maxMessage">bitbag_sylius_cms_plugin.section.name.max_length</option>
+                <option name="groups">
+                    <value>bitbag</value>
+                </option>
+            </constraint>
+        </property>
+    </class>
+</constraint-mapping>
diff --git a/tests/Behat/Resources/services/contexts/ui.xml b/tests/Behat/Resources/services/contexts/ui.xml
index 4043a6bbb..ce646296a 100644
--- a/tests/Behat/Resources/services/contexts/ui.xml
+++ b/tests/Behat/Resources/services/contexts/ui.xml
@@ -4,30 +4,74 @@
     <services>
         <defaults public="true" />
 
-            <service id="bitbag_sylius_cms_plugin.behat.context.ui.admin.block" class="Tests\BitBag\SyliusCmsPlugin\Behat\Context\Ui\Admin\BlockContext">
-                <argument type="service" id="sylius.behat.shared_storage"/>
-                <argument type="service" id="sylius.behat.current_page_resolver"/>
-                <argument type="service" id="sylius.behat.notification_checker"/>
-                <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.block.index"/>
-                <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.block.create"/>
-                <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.block.update"/>
-                <argument type="service" id="bitbag_sylius_cms_plugin.behat.random_string_generator"/>
-                <argument type="service" id="bitbag_sylius_cms_plugin.repository.block"/>
-            </service>
-
-            <service id="bitbag_sylius_cms_plugin.behat.context.ui.admin.page" class="Tests\BitBag\SyliusCmsPlugin\Behat\Context\Ui\Admin\PageContext">
-                <argument type="service" id="sylius.behat.shared_storage"/>
-                <argument type="service" id="sylius.behat.current_page_resolver"/>
-                <argument type="service" id="sylius.behat.notification_checker"/>
-                <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.page.index"/>
-                <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.page.create"/>
-                <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.page.update"/>
-                <argument type="service" id="bitbag_sylius_cms_plugin.behat.random_string_generator"/>
-                <argument type="service" id="bitbag_sylius_cms_plugin.repository.page"/>
-            </service>
-
-            <service id="bitbag_sylius_cms_plugin.behat.context.ui.shop.media" class="Tests\BitBag\SyliusCmsPlugin\Behat\Context\Ui\Shop\MediaContext">
-                <argument type="service" id="bitbag_sylius_cms_plugin.repository.media"/>
-            </service>
+        <service id="bitbag_sylius_cms_plugin.behat.context.ui.admin.block" class="Tests\BitBag\SyliusCmsPlugin\Behat\Context\Ui\Admin\BlockContext">
+            <argument type="service" id="sylius.behat.shared_storage"/>
+            <argument type="service" id="sylius.behat.current_page_resolver"/>
+            <argument type="service" id="sylius.behat.notification_checker"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.block.index"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.block.create"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.block.update"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.random_string_generator"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.repository.block"/>
+        </service>
+
+        <service id="bitbag_sylius_cms_plugin.behat.context.ui.admin.page" class="Tests\BitBag\SyliusCmsPlugin\Behat\Context\Ui\Admin\PageContext">
+            <argument type="service" id="sylius.behat.shared_storage"/>
+            <argument type="service" id="sylius.behat.current_page_resolver"/>
+            <argument type="service" id="sylius.behat.notification_checker"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.page.index"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.page.create"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.page.update"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.random_string_generator"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.repository.page"/>
+        </service>
+
+        <service id="bitbag_sylius_cms_plugin.behat.context.ui.admin.frequently_asked_question" class="Tests\BitBag\SyliusCmsPlugin\Behat\Context\Ui\Admin\FrequentlyAskedQuestionContext">
+            <argument type="service" id="sylius.behat.shared_storage"/>
+            <argument type="service" id="sylius.behat.current_page_resolver"/>
+            <argument type="service" id="sylius.behat.notification_checker"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.frequently_asked_question.index"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.frequently_asked_question.create"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.frequently_asked_question.update"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.random_string_generator"/>
+        </service>
+
+        <service id="bitbag_sylius_cms_plugin.behat.context.ui.admin.section" class="Tests\BitBag\SyliusCmsPlugin\Behat\Context\Ui\Admin\SectionContext">
+            <argument type="service" id="sylius.behat.shared_storage"/>
+            <argument type="service" id="sylius.behat.current_page_resolver"/>
+            <argument type="service" id="sylius.behat.notification_checker"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.section.index"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.section.create"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.section.update"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.random_string_generator"/>
+        </service>
+
+        <service id="bitbag_sylius_cms_plugin.behat.context.ui.shop.homepage_blocks" class="Tests\BitBag\SyliusCmsPlugin\Behat\Context\Ui\Shop\HomepageBlocksContext">
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.shop.home"/>
+        </service>
+
+        <service id="bitbag_sylius_cms_plugin.behat.context.ui.shop.page" class="Tests\BitBag\SyliusCmsPlugin\Behat\Context\Ui\Shop\PageContext">
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.shop.page.show"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.shop.page.index"/>
+            <argument type="service" id="sylius.behat.shared_storage"/>
+        </service>
+
+        <service id="bitbag_sylius_cms_plugin.behat.context.ui.shop.frequently_asked_question" class="Tests\BitBag\SyliusCmsPlugin\Behat\Context\Ui\Shop\FrequentlyAskedQuestionContext">
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.shop.frequently_asked_question.index"/>
+        </service>
+
+        <service id="bitbag_sylius_cms_plugin.behat.context.ui.admin.media" class="Tests\BitBag\SyliusCmsPlugin\Behat\Context\Ui\Admin\MediaContext">
+            <argument type="service" id="sylius.behat.current_page_resolver"/>
+            <argument type="service" id="sylius.behat.notification_checker"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.media.index"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.media.create"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.admin.media.update"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.random_string_generator"/>
+        </service>
+
+        <service id="bitbag_sylius_cms_plugin.behat.context.ui.shop.media" class="Tests\BitBag\SyliusCmsPlugin\Behat\Context\Ui\Shop\MediaContext">
+            <argument type="service" id="bitbag_sylius_cms_plugin.repository.media"/>
+            <argument type="service" id="bitbag_sylius_cms_plugin.behat.page.shop.home"/>
+        </service>
     </services>
 </container>
diff --git a/tests/Behat/Resources/services/pages/admin/block.xml b/tests/Behat/Resources/services/pages/admin/block.xml
index 91db56119..6e3d7720f 100644
--- a/tests/Behat/Resources/services/pages/admin/block.xml
+++ b/tests/Behat/Resources/services/pages/admin/block.xml
@@ -5,15 +5,15 @@
         <defaults public="true" />
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.block.index" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\Block\IndexPage" parent="sylius.behat.page.admin.crud.index" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_block_index'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_block_index</argument>
             </service>
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.block.create" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\Block\CreatePage" parent="sylius.behat.page.admin.crud.create" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_block_create'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_block_create</argument>
             </service>
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.block.update" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\Block\UpdatePage" parent="sylius.behat.page.admin.crud.update" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_block_update'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_block_update</argument>
             </service>
     </services>
 </container>
diff --git a/tests/Behat/Resources/services/pages/admin/frequently_asked_question.xml b/tests/Behat/Resources/services/pages/admin/frequently_asked_question.xml
index e3187a5a2..d12b00f9e 100644
--- a/tests/Behat/Resources/services/pages/admin/frequently_asked_question.xml
+++ b/tests/Behat/Resources/services/pages/admin/frequently_asked_question.xml
@@ -5,15 +5,15 @@
         <defaults public="true" />
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.frequently_asked_question.index" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\FrequentlyAskedQuestion\IndexPage" parent="sylius.behat.page.admin.crud.index" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_frequently_asked_question_index'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_frequently_asked_question_index</argument>
             </service>
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.frequently_asked_question.create" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\FrequentlyAskedQuestion\CreatePage" parent="sylius.behat.page.admin.crud.create" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_frequently_asked_question_create'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_frequently_asked_question_create</argument>
             </service>
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.frequently_asked_question.update" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\FrequentlyAskedQuestion\UpdatePage" parent="sylius.behat.page.admin.crud.update" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_frequently_asked_question_update'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_frequently_asked_question_update</argument>
             </service>
     </services>
 </container>
diff --git a/tests/Behat/Resources/services/pages/admin/media.xml b/tests/Behat/Resources/services/pages/admin/media.xml
index 859d458d4..1ecf98438 100644
--- a/tests/Behat/Resources/services/pages/admin/media.xml
+++ b/tests/Behat/Resources/services/pages/admin/media.xml
@@ -5,15 +5,15 @@
         <defaults public="true" />
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.media.index" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\Media\IndexPage" parent="sylius.behat.page.admin.crud.index" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_media_index'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_media_index</argument>
             </service>
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.media.create" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\Media\CreatePage" parent="sylius.behat.page.admin.crud.create" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_media_create'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_media_create</argument>
             </service>
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.media.update" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\Media\UpdatePage" parent="sylius.behat.page.admin.crud.update" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_media_update'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_media_update</argument>
             </service>
     </services>
 </container>
diff --git a/tests/Behat/Resources/services/pages/admin/page.xml b/tests/Behat/Resources/services/pages/admin/page.xml
index 391d2e2b4..39d7c6024 100644
--- a/tests/Behat/Resources/services/pages/admin/page.xml
+++ b/tests/Behat/Resources/services/pages/admin/page.xml
@@ -5,15 +5,15 @@
         <defaults public="true" />
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.page.index" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\Page\IndexPage" parent="sylius.behat.page.admin.crud.index" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_page_index'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_page_index</argument>
             </service>
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.page.create" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\Page\CreatePage" parent="sylius.behat.page.admin.crud.create" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_page_create'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_page_create</argument>
             </service>
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.page.update" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\Page\UpdatePage" parent="sylius.behat.page.admin.crud.update" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_page_update'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_page_update</argument>
             </service>
     </services>
 </container>
diff --git a/tests/Behat/Resources/services/pages/admin/section.xml b/tests/Behat/Resources/services/pages/admin/section.xml
index 1b899f474..6aeefa32a 100644
--- a/tests/Behat/Resources/services/pages/admin/section.xml
+++ b/tests/Behat/Resources/services/pages/admin/section.xml
@@ -5,15 +5,15 @@
         <defaults public="true" />
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.section.index" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\Section\IndexPage" parent="sylius.behat.page.admin.crud.index" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_section_index'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_section_index</argument>
             </service>
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.section.create" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\Section\CreatePage" parent="sylius.behat.page.admin.crud.create" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_section_create'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_section_create</argument>
             </service>
 
             <service id="bitbag_sylius_cms_plugin.behat.page.admin.section.update" class="Tests\BitBag\SyliusCmsPlugin\Behat\Page\Admin\Section\UpdatePage" parent="sylius.behat.page.admin.crud.update" public="false">
-                <argument>'bitbag_sylius_cms_plugin_admin_section_update'</argument>
+                <argument>bitbag_sylius_cms_plugin_admin_section_update</argument>
             </service>
     </services>
 </container>