diff --git a/Jenkinsfile b/Jenkinsfile
index aed8448..cfae6cb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,10 +49,8 @@ if (launchUnitTests.equals("yes")) {
         def tasks = [:]
 
         tasks["phpspec-5.6"] = {runPhpSpecTest("5.6")}
-        tasks["phpspec-7.0"] = {runPhpSpecTest("7.0")}
         tasks["phpspec-7.1"] = {runPhpSpecTest("7.1")}
-
-        tasks["php-cs-fixer-7.1"] = {runPhpCsFixerTest("7.0")}
+        tasks["php-cs-fixer-5.6"] = {runPhpCsFixerTest("5.6")}
 
         parallel tasks
     }
@@ -62,7 +60,8 @@ if (launchIntegrationTests.equals("yes")) {
     stage("Integration tests") {
         def tasks = [:]
 
-        tasks["phpunit-5.6-ce"] = {runIntegrationTest("5.6")}
+        tasks["phpunit-5.6-ce"] = {runIntegrationTestCe("5.6")}
+        tasks["phpunit-5.6-ee"] = {runIntegrationTestEe("5.6")}
 
         parallel tasks
     }
@@ -114,35 +113,88 @@ def runPhpCsFixerTest(version) {
     }
 }
 
-def runIntegrationTest(version) {
+def runIntegrationTestCe(version) {
     node('docker') {
         deleteDir()
-        docker.image("mysql:5.5").withRun("--name mysql -e MYSQL_ROOT_PASSWORD=root -e MYSQL_USER=akeneo_pim -e MYSQL_PASSWORD=akeneo_pim -e MYSQL_DATABASE=akeneo_pim") {
-            docker.image("carcel/php:${version}").inside("--link mysql:mysql -v /home/akeneo/.composer:/home/akeneo/.composer -e COMPOSER_HOME=/home/akeneo/.composer") {
-                unstash "pim_community"
-
-                if (version != "5.6") {
-                    sh "composer require --no-update alcaeus/mongo-php-adapter"
+        try {
+            docker.image("mysql:5.5").withRun("--name mysql -e MYSQL_ROOT_PASSWORD=root -e MYSQL_USER=akeneo_pim -e MYSQL_PASSWORD=akeneo_pim -e MYSQL_DATABASE=akeneo_pim") {
+                docker.image("carcel/php:${version}").inside("--link mysql:mysql -v /home/akeneo/.composer:/home/akeneo/.composer -e COMPOSER_HOME=/home/akeneo/.composer") {
+                    unstash "pim_community"
+
+                    if (version != "5.6") {
+                        sh "composer require --no-update alcaeus/mongo-php-adapter"
+                    }
+
+                    sh "composer require --no-update phpunit/phpunit:5.4 akeneo/extended-attribute-type:${Globals.extensionBranch}"
+                    sh "composer update --ignore-platform-reqs --optimize-autoloader --no-interaction --no-progress --prefer-dist"
+                    dir("vendor/akeneo/extended-attribute-type") {
+                        deleteDir()
+                        unstash "extended_attributes"
+                    }
+                    sh 'ln -s $(pwd)/vendor/akeneo/extended-attribute-type/doc/example/Pim src/Pim'
+                    sh 'composer dump-autoload -o'
+
+                    sh "cp vendor/akeneo/extended-attribute-type/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/config_test.yml app/config/config_test.yml"
+                    sh "cp vendor/akeneo/extended-attribute-type/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/parameters_test.yml app/config/parameters_test.yml"
+
+                    sh "sed -i 's#// your app bundles should be registered here#\\0\\nnew Pim\\\\Bundle\\\\ExtendedCeBundle\\\\ExtendedCeBundle(),#' app/AppKernel.php"
+                    sh "sed -i 's#// your app bundles should be registered here#\\0\\nnew Pim\\\\Bundle\\\\ExtendedAttributeTypeBundle\\\\PimExtendedAttributeTypeBundle(),#' app/AppKernel.php"
+                    sh "cat app/AppKernel.php"
+
+
+                    sh "rm ./app/cache/* -rf"
+                    sh "./app/console --env=test pim:install --force"
+                    sh "mkdir -p app/build/logs/"
+                    sh "./bin/phpunit -c app/ --log-junit app/build/logs/phpunit.xml  vendor/akeneo/extended-attribute-type/Tests"
                 }
+            }
+        } finally {
+            sh "sed -i \"s/testcase name=\\\"/testcase name=\\\"[php-${version}] /\" app/build/logs/*.xml"
+            junit "app/build/logs/*.xml"
+            deleteDir()
+        }
+    }
+}
 
-                sh "composer require --no-update phpunit/phpunit akeneo/extended-attribute-type ${Globals.extensionBranch}"
-                sh "composer update --ignore-platform-reqs --optimize-autoloader --no-interaction --no-progress --prefer-dist"
-
-                dir("vendor/akeneo/extended_attributes") {
-                    unstash "extended_attributes"
+def runIntegrationTestEe(version) {
+    node('docker') {
+        deleteDir()
+        try {
+            docker.image("mysql:5.5").withRun("--name mysql -e MYSQL_ROOT_PASSWORD=root -e MYSQL_USER=akeneo_pim -e MYSQL_PASSWORD=akeneo_pim -e MYSQL_DATABASE=akeneo_pim") {
+                docker.image("carcel/php:${version}").inside("--link mysql:mysql -v /home/akeneo/.composer:/home/akeneo/.composer -e COMPOSER_HOME=/home/akeneo/.composer") {
+                    unstash "pim_enterprise"
+
+                    if (version != "5.6") {
+                        sh "composer require --no-update alcaeus/mongo-php-adapter"
+                    }
+
+                    sh "composer require --no-update phpunit/phpunit:5.4 akeneo/extended-attribute-type:${Globals.extensionBranch}"
+                    sh "composer update --ignore-platform-reqs --optimize-autoloader --no-interaction --no-progress --prefer-dist"
+                    dir("vendor/akeneo/extended-attribute-type") {
+                        deleteDir()
+                        unstash "extended_attributes"
+                    }
+                    sh 'ln -s $(pwd)/vendor/akeneo/extended-attribute-type/doc/example/Pim src/Pim'
+                    sh 'composer dump-autoload -o'
+
+                    sh "cp vendor/akeneo/extended-attribute-type/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/config_test.yml app/config/config_test.yml"
+                    sh "cp vendor/akeneo/extended-attribute-type/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/parameters_test.yml app/config/parameters_test.yml"
+
+                    sh "sed -i 's#// your app bundles should be registered here#\\0\\nnew Pim\\\\Bundle\\\\ExtendedEeBundle\\\\ExtendedEeBundle(),#' app/AppKernel.php"
+                    sh "sed -i 's#// your app bundles should be registered here#\\0\\nnew Pim\\\\Bundle\\\\ExtendedAttributeTypeBundle\\\\PimExtendedAttributeTypeBundle(),#' app/AppKernel.php"
+                    sh "cat app/AppKernel.php"
+
+
+                    sh "rm ./app/cache/* -rf"
+                    sh "./app/console --env=test pim:install --force"
+                    sh "mkdir -p app/build/logs/"
+                    sh "./bin/phpunit -c app/ --log-junit app/build/logs/phpunit.xml  vendor/akeneo/extended-attribute-type/Tests"
                 }
-                sh "composer dump-autoload -o"
-
-                sh "cp app/config/parameters.yml.dist app/config/parameters_test.yml"
-                sh "sed -i 's/database_host:     localhost/database_host:     mysql/' app/config/parameters_test.yml"
-                sh "echo '' >> app/config/parameters_test.yml"
-                sh "sed -i 's#// your app bundles should be registered here#\\0\\nnew Pim\\\\Bundle\\\\ExtendedAttributeTypeBundle\\\\PimExtendedAttributeTypeBundle(),#' app/AppKernel.php"
-                sh "sed -i 's#// your app bundles should be registered here#\\0\\nnew Acme\\\\Bundle\\\\AppBundle\\\\AcmeAppBundle(),#' app/AppKernel.php"
-
-                sh "cp vendor/akeneo/extended_attributes/doc/example/app/config/config_test.yml app/config/config_test.yml"
-
-                 sh "./app/console --env=test pim:install --force"
             }
+        } finally {
+            sh "sed -i \"s/testcase name=\\\"/testcase name=\\\"[php-${version}] /\" app/build/logs/*.xml"
+            junit "app/build/logs/*.xml"
+            deleteDir()
         }
     }
 }
diff --git a/Tests/TextCollection/TextCollectionTest.php b/Tests/TextCollection/TextCollectionTest.php
new file mode 100644
index 0000000..15acfc7
--- /dev/null
+++ b/Tests/TextCollection/TextCollectionTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Tests\TextCollection;
+
+use Pim\Behat\Context\DBALPurger;
+use Pim\Bundle\ExtendedAttributeTypeBundle\AttributeType\ExtendedAttributeTypes;
+use Pim\Component\Catalog\Model\AttributeInterface;
+use Pim\Component\Catalog\Repository\AttributeGroupRepositoryInterface;
+use Pim\Component\Catalog\Repository\AttributeRepositoryInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class TextCollectionTest extends KernelTestCase
+{
+    /** @var ContainerInterface */
+    private $container;
+
+    /** @var AttributeRepositoryInterface */
+    private $attributeRepo;
+
+    /** @var AttributeGroupRepositoryInterface */
+    private $attributeGroupRepo;
+
+    public function setUp()
+    {
+        self::bootKernel();
+        $this->container = self::$kernel->getContainer();
+        $connection = $this->container->get('doctrine.dbal.default_connection');
+        $purger = new DBALPurger($connection, ['pim_catalog_group_attribute', 'pim_catalog_attribute']);
+        $purger->purge();
+
+        $this->attributeRepo = $this->container->get('pim_catalog.repository.attribute');
+        $this->attributeGroupRepo = $this->container->get('pim_catalog.repository.attribute_group');
+    }
+
+    public function testCreateAttribute()
+    {
+        $factory = $this->container->get('pim_catalog.factory.attribute');
+        $attribute = $factory->createAttribute('pim_catalog_text_collection');
+        $attribute->setCode('my_collection');
+        $this->assertEquals(ExtendedAttributeTypes::TEXT_COLLECTION, $attribute->getAttributeType());
+        $this->assertEquals(ExtendedAttributeTypes::BACKEND_TYPE_TEXT_COLLECTION, $attribute->getBackendType());
+
+        $defaultGroup = $this->attributeGroupRepo->findDefaultAttributeGroup();
+        $attribute->setGroup($defaultGroup);
+
+        $saver = $this->container->get('pim_catalog.saver.attribute');
+        $saver->save($attribute);
+        unset($attributeGroupRepo);
+        unset($attribute);
+
+        /** @var AttributeInterface $savedAttribute */
+        $savedAttribute = $this->attributeRepo->findOneByIdentifier('my_collection');
+        $this->assertInstanceOf(AttributeInterface::class, $savedAttribute);
+        $this->assertEquals(ExtendedAttributeTypes::TEXT_COLLECTION, $savedAttribute->getAttributeType());
+        $this->assertEquals(ExtendedAttributeTypes::BACKEND_TYPE_TEXT_COLLECTION, $savedAttribute->getBackendType());
+        $this->assertEquals($defaultGroup->getCode(), $savedAttribute->getGroup()->getCode());
+    }
+}
diff --git a/composer.json b/composer.json
index 0603795..eb0004a 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,9 @@
     },
     "autoload": {
         "psr-4": {
-            "Pim\\Bundle\\ExtendedAttributeTypeBundle\\": "src/"
+            "Pim\\Bundle\\ExtendedAttributeTypeBundle\\": "src/",
+            "Pim\\Bundle\\ExtendedCeBundle\\": "doc/example/PimBundle/ExtendedCeBundle",
+            "Pim\\Bundle\\ExtendedEeBundle\\": "doc/example/PimBundle/ExtendedEeBundle"
         }
     },
     "config": {
diff --git a/doc/example/Acme/Bundle/AppBundle/Resources/config/entities.yml b/doc/example/Acme/Bundle/AppBundle/Resources/config/entities.yml
deleted file mode 100644
index 8695c25..0000000
--- a/doc/example/Acme/Bundle/AppBundle/Resources/config/entities.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-parameters:
-    pim_catalog.entity.product_value.class: Acme\Bundle\AppBundle\Model\ProductValue
diff --git a/doc/example/Acme/Bundle/AppEEBundle/Resources/config/entities.yml b/doc/example/Acme/Bundle/AppEEBundle/Resources/config/entities.yml
deleted file mode 100644
index 043344a..0000000
--- a/doc/example/Acme/Bundle/AppEEBundle/Resources/config/entities.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-parameters:
-    pim_catalog.entity.product_value.class: Acme\Bundle\AppEEBundle\Model\ProductValue
-    pimee_workflow.entity.published_product_value.class: Acme\Bundle\AppEEBundle\Model\PublishedProductValue
diff --git a/doc/example/Acme/Bundle/AppEEBundle/Resources/config/storage_driver/orm/orm.yml b/doc/example/Acme/Bundle/AppEEBundle/Resources/config/storage_driver/orm/orm.yml
deleted file mode 100644
index 9819d17..0000000
--- a/doc/example/Acme/Bundle/AppEEBundle/Resources/config/storage_driver/orm/orm.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-parameters:
-    pim_catalog.doctrine.completeness_generator.class: Acme\Bundle\AppEEBundle\Doctrine\ORM\EECompletenessGenerator
diff --git a/doc/example/Acme/Bundle/AppEEBundle/DependencyInjection/AcmeAppEEExtension.php b/doc/example/Pim/Bundle/ExtendedCeBundle/DependencyInjection/ExtendedCeExtension.php
similarity index 84%
rename from doc/example/Acme/Bundle/AppEEBundle/DependencyInjection/AcmeAppEEExtension.php
rename to doc/example/Pim/Bundle/ExtendedCeBundle/DependencyInjection/ExtendedCeExtension.php
index 928a590..a9a5c80 100644
--- a/doc/example/Acme/Bundle/AppEEBundle/DependencyInjection/AcmeAppEEExtension.php
+++ b/doc/example/Pim/Bundle/ExtendedCeBundle/DependencyInjection/ExtendedCeExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Acme\Bundle\AppEEBundle\DependencyInjection;
+namespace Pim\Bundle\ExtendedCeBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -10,7 +10,7 @@
 /**
  * @author Romain Monceau <romain@akeneo.com>
  */
-class AcmeAppEEExtension extends Extension
+class ExtendedCeExtension extends Extension
 {
     /**
      * {@inheritdoc}
diff --git a/doc/example/Acme/Bundle/AppBundle/AcmeAppBundle.php b/doc/example/Pim/Bundle/ExtendedCeBundle/ExtendedCeBundle.php
similarity index 91%
rename from doc/example/Acme/Bundle/AppBundle/AcmeAppBundle.php
rename to doc/example/Pim/Bundle/ExtendedCeBundle/ExtendedCeBundle.php
index 120c155..8f657cc 100644
--- a/doc/example/Acme/Bundle/AppBundle/AcmeAppBundle.php
+++ b/doc/example/Pim/Bundle/ExtendedCeBundle/ExtendedCeBundle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Acme\Bundle\AppBundle;
+namespace Pim\Bundle\ExtendedCeBundle;
 
 use Akeneo\Bundle\StorageUtilsBundle\AkeneoStorageUtilsBundle;
 use Akeneo\Bundle\StorageUtilsBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass;
@@ -10,7 +10,7 @@
 /**
  * @author Romain Monceau <romain@akeneo.com>
  */
-class AcmeAppBundle extends Bundle
+class ExtendedCeBundle extends Bundle
 {
     /**
      * {@inheritdoc}
@@ -18,7 +18,7 @@ class AcmeAppBundle extends Bundle
     public function build(ContainerBuilder $container)
     {
         $productMappings = [
-            realpath(__DIR__ . '/Resources/config/model/doctrine') => 'Acme\Bundle\AppBundle\Model'
+            realpath(__DIR__ . '/Resources/config/model/doctrine') => 'Pim\Bundle\ExtendedCeBundle\Model'
         ];
 
         $container->addCompilerPass(
diff --git a/doc/example/Acme/Bundle/AppBundle/Model/ProductValue.php b/doc/example/Pim/Bundle/ExtendedCeBundle/Model/ProductValue.php
similarity index 89%
rename from doc/example/Acme/Bundle/AppBundle/Model/ProductValue.php
rename to doc/example/Pim/Bundle/ExtendedCeBundle/Model/ProductValue.php
index a24139e..d2cda78 100644
--- a/doc/example/Acme/Bundle/AppBundle/Model/ProductValue.php
+++ b/doc/example/Pim/Bundle/ExtendedCeBundle/Model/ProductValue.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Acme\Bundle\AppBundle\Model;
+namespace Pim\Bundle\ExtendedCeBundle\Model;
 
 use Pim\Bundle\ExtendedAttributeTypeBundle\Model\TextCollectionValueTrait;
 use Pim\Component\Catalog\Model\ProductValue as PimProductValue;
diff --git a/doc/example/app/config/config_test.yml b/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/config_test.yml
similarity index 88%
rename from doc/example/app/config/config_test.yml
rename to doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/config_test.yml
index 8ba07c5..61e9609 100644
--- a/doc/example/app/config/config_test.yml
+++ b/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/config_test.yml
@@ -27,4 +27,4 @@ akeneo_storage_utils:
     mapping_overrides:
         -
             original: Pim\Component\Catalog\Model\ProductValue
-            override: Acme\Bundle\AppBundle\Model\ProductValue
+            override: Pim\Bundle\ExtendedCeBundle\Model\ProductValue
diff --git a/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/entities.yml b/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/entities.yml
new file mode 100644
index 0000000..125e077
--- /dev/null
+++ b/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/entities.yml
@@ -0,0 +1,2 @@
+parameters:
+    pim_catalog.entity.product_value.class: Pim\Bundle\ExtendedCeBundle\Model\ProductValue
diff --git a/doc/example/Acme/Bundle/AppBundle/Resources/config/model/doctrine/ProductValue.mongodb.yml b/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/model/doctrine/ProductValue.mongodb.yml
similarity index 63%
rename from doc/example/Acme/Bundle/AppBundle/Resources/config/model/doctrine/ProductValue.mongodb.yml
rename to doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/model/doctrine/ProductValue.mongodb.yml
index e3e662b..256d1dd 100644
--- a/doc/example/Acme/Bundle/AppBundle/Resources/config/model/doctrine/ProductValue.mongodb.yml
+++ b/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/model/doctrine/ProductValue.mongodb.yml
@@ -1,4 +1,4 @@
-Acme\Bundle\AppBundle\Model\ProductValue:
+Pim\Bundle\ExtendedCeBundle\Model\ProductValue:
     type: embeddedDocument
     fields:
         textCollection:
diff --git a/doc/example/Acme/Bundle/AppBundle/Resources/config/model/doctrine/ProductValue.orm.yml b/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/model/doctrine/ProductValue.orm.yml
similarity index 91%
rename from doc/example/Acme/Bundle/AppBundle/Resources/config/model/doctrine/ProductValue.orm.yml
rename to doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/model/doctrine/ProductValue.orm.yml
index 2ec2cca..42613fb 100644
--- a/doc/example/Acme/Bundle/AppBundle/Resources/config/model/doctrine/ProductValue.orm.yml
+++ b/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/model/doctrine/ProductValue.orm.yml
@@ -1,4 +1,4 @@
-Acme\Bundle\AppBundle\Model\ProductValue:
+Pim\Bundle\ExtendedCeBundle\Model\ProductValue:
     type: entity
     table: pim_catalog_product_value
     changeTrackingPolicy: DEFERRED_EXPLICIT
diff --git a/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/parameters_test.yml b/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/parameters_test.yml
new file mode 100644
index 0000000..630c46c
--- /dev/null
+++ b/doc/example/Pim/Bundle/ExtendedCeBundle/Resources/config/parameters_test.yml
@@ -0,0 +1,10 @@
+parameters:
+    database_driver: pdo_mysql
+    database_host: mysql
+    database_port: null
+    database_name: akeneo_pim
+    database_user: akeneo_pim
+    database_password: akeneo_pim
+    locale: en
+    secret: ThisTokenIsNotSoSecretChangeIt
+    installer_data:       PimInstallerBundle:minimal
diff --git a/doc/example/Acme/Bundle/AppBundle/DependencyInjection/AcmeAppExtension.php b/doc/example/Pim/Bundle/ExtendedEeBundle/DependencyInjection/ExtendedEeExtension.php
similarity index 84%
rename from doc/example/Acme/Bundle/AppBundle/DependencyInjection/AcmeAppExtension.php
rename to doc/example/Pim/Bundle/ExtendedEeBundle/DependencyInjection/ExtendedEeExtension.php
index e1b5d41..b08b114 100644
--- a/doc/example/Acme/Bundle/AppBundle/DependencyInjection/AcmeAppExtension.php
+++ b/doc/example/Pim/Bundle/ExtendedEeBundle/DependencyInjection/ExtendedEeExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Acme\Bundle\AppBundle\DependencyInjection;
+namespace Pim\Bundle\ExtendedEeBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -10,7 +10,7 @@
 /**
  * @author Romain Monceau <romain@akeneo.com>
  */
-class AcmeAppExtension extends Extension
+class ExtendedEeExtension extends Extension
 {
     /**
      * {@inheritdoc}
diff --git a/doc/example/Acme/Bundle/AppEEBundle/Doctrine/ORM/EECompletenessGenerator.php b/doc/example/Pim/Bundle/ExtendedEeBundle/Doctrine/ORM/EECompletenessGenerator.php
similarity index 81%
rename from doc/example/Acme/Bundle/AppEEBundle/Doctrine/ORM/EECompletenessGenerator.php
rename to doc/example/Pim/Bundle/ExtendedEeBundle/Doctrine/ORM/EECompletenessGenerator.php
index 8527a6c..4af1c74 100644
--- a/doc/example/Acme/Bundle/AppEEBundle/Doctrine/ORM/EECompletenessGenerator.php
+++ b/doc/example/Pim/Bundle/ExtendedEeBundle/Doctrine/ORM/EECompletenessGenerator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Acme\Bundle\AppEEBundle\Doctrine\ORM;
+namespace Pim\Bundle\ExtendedEeBundle\Doctrine\ORM;
 
 use PimEnterprise\Bundle\CatalogBundle\Doctrine\ORM\CompletenessGenerator as BaseCompletenessGenerator;
 
diff --git a/doc/example/Acme/Bundle/AppEEBundle/AcmeAppEEBundle.php b/doc/example/Pim/Bundle/ExtendedEeBundle/ExtendedEeBundle.php
similarity index 91%
rename from doc/example/Acme/Bundle/AppEEBundle/AcmeAppEEBundle.php
rename to doc/example/Pim/Bundle/ExtendedEeBundle/ExtendedEeBundle.php
index 28ad98f..b46aca3 100644
--- a/doc/example/Acme/Bundle/AppEEBundle/AcmeAppEEBundle.php
+++ b/doc/example/Pim/Bundle/ExtendedEeBundle/ExtendedEeBundle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Acme\Bundle\AppEEBundle;
+namespace Pim\Bundle\ExtendedEeBundle;
 
 use Akeneo\Bundle\StorageUtilsBundle\AkeneoStorageUtilsBundle;
 use Akeneo\Bundle\StorageUtilsBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass;
@@ -10,7 +10,7 @@
 /**
  * @author Romain Monceau <romain@akeneo.com>
  */
-class AcmeAppEEBundle extends Bundle
+class ExtendedEeBundle extends Bundle
 {
     /**
      * {@inheritdoc}
@@ -18,7 +18,7 @@ class AcmeAppEEBundle extends Bundle
     public function build(ContainerBuilder $container)
     {
         $productMappings = [
-            realpath(__DIR__ . '/Resources/config/model/doctrine') => 'Acme\Bundle\AppEEBundle\Model'
+            realpath(__DIR__ . '/Resources/config/model/doctrine') => 'Pim\Bundle\ExtendedEeBundle\Model'
         ];
 
         $container->addCompilerPass(
diff --git a/doc/example/Acme/Bundle/AppEEBundle/Model/ProductValue.php b/doc/example/Pim/Bundle/ExtendedEeBundle/Model/ProductValue.php
similarity index 89%
rename from doc/example/Acme/Bundle/AppEEBundle/Model/ProductValue.php
rename to doc/example/Pim/Bundle/ExtendedEeBundle/Model/ProductValue.php
index e947ef0..2d02412 100644
--- a/doc/example/Acme/Bundle/AppEEBundle/Model/ProductValue.php
+++ b/doc/example/Pim/Bundle/ExtendedEeBundle/Model/ProductValue.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Acme\Bundle\AppEEBundle\Model;
+namespace Pim\Bundle\ExtendedEeBundle\Model;
 
 use Pim\Bundle\ExtendedAttributeTypeBundle\Model\TextCollectionValueTrait;
 use PimEnterprise\Component\Catalog\Model\ProductValue as PimProductValue;
diff --git a/doc/example/Acme/Bundle/AppEEBundle/Model/PublishedProductValue.php b/doc/example/Pim/Bundle/ExtendedEeBundle/Model/PublishedProductValue.php
similarity index 90%
rename from doc/example/Acme/Bundle/AppEEBundle/Model/PublishedProductValue.php
rename to doc/example/Pim/Bundle/ExtendedEeBundle/Model/PublishedProductValue.php
index 20fb83a..4bec135 100644
--- a/doc/example/Acme/Bundle/AppEEBundle/Model/PublishedProductValue.php
+++ b/doc/example/Pim/Bundle/ExtendedEeBundle/Model/PublishedProductValue.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Acme\Bundle\AppEEBundle\Model;
+namespace Pim\Bundle\ExtendedEeBundle\Model;
 
 use Pim\Bundle\ExtendedAttributeTypeBundle\Model\TextCollectionValueTrait;
 use PimEnterprise\Component\Workflow\Model\PublishedProductValue as PimPublishedProductValue;
diff --git a/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/config_test.yml b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/config_test.yml
new file mode 100644
index 0000000..ee9842e
--- /dev/null
+++ b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/config_test.yml
@@ -0,0 +1,39 @@
+imports:
+    - { resource: config_dev.yml }
+    - { resource: parameters_test.yml }
+    - { resource: security_test.yml }
+
+framework:
+    test: ~
+    session:
+        storage_id: session.storage.mock_file
+    csrf_protection: true
+    profiler:
+        collect: false
+
+web_profiler:
+    toolbar: false
+    intercept_redirects: false
+
+swiftmailer:
+    disable_delivery: true
+
+assetic:
+    use_controller: false
+
+pim_reference_data: ~
+
+akeneo_storage_utils:
+    mapping_overrides:
+        -
+            original: Pim\Component\Catalog\Model\ProductValue
+            override: PimEnterprise\Component\Catalog\Model\ProductValue
+        -
+            original: PimEnterprise\Component\Catalog\Model\ProductValue
+            override: Pim\Bundle\ExtendedEeBundle\Model\ProductValue
+        -
+            original: PimEnterprise\Component\Workflow\Model\PublishedProductValue
+            override: Pim\Bundle\ExtendedEeBundle\Model\PublishedProductValue
+        -
+            original: Pim\Bundle\UserBundle\Entity\User
+            override: PimEnterprise\Bundle\UserBundle\Entity\User
diff --git a/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/entities.yml b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/entities.yml
new file mode 100644
index 0000000..6390797
--- /dev/null
+++ b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/entities.yml
@@ -0,0 +1,3 @@
+parameters:
+    pim_catalog.entity.product_value.class: Pim\Bundle\ExtendedEeBundle\Model\ProductValue
+    pimee_workflow.entity.published_product_value.class: Pim\Bundle\ExtendedEeBundle\Model\PublishedProductValue
diff --git a/doc/example/Acme/Bundle/AppEEBundle/Resources/config/model/doctrine/ProductValue.mongodb.yml b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/model/doctrine/ProductValue.mongodb.yml
similarity index 63%
rename from doc/example/Acme/Bundle/AppEEBundle/Resources/config/model/doctrine/ProductValue.mongodb.yml
rename to doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/model/doctrine/ProductValue.mongodb.yml
index ed1b31d..256d039 100644
--- a/doc/example/Acme/Bundle/AppEEBundle/Resources/config/model/doctrine/ProductValue.mongodb.yml
+++ b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/model/doctrine/ProductValue.mongodb.yml
@@ -1,4 +1,4 @@
-Acme\Bundle\AppEEBundle\Model\ProductValue:
+Pim\Bundle\ExtendedEeBundle\Model\ProductValue:
     type: embeddedDocument
     fields:
         textCollection:
diff --git a/doc/example/Acme/Bundle/AppEEBundle/Resources/config/model/doctrine/ProductValue.orm.yml b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/model/doctrine/ProductValue.orm.yml
similarity index 91%
rename from doc/example/Acme/Bundle/AppEEBundle/Resources/config/model/doctrine/ProductValue.orm.yml
rename to doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/model/doctrine/ProductValue.orm.yml
index 0a058ce..b874bad 100644
--- a/doc/example/Acme/Bundle/AppEEBundle/Resources/config/model/doctrine/ProductValue.orm.yml
+++ b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/model/doctrine/ProductValue.orm.yml
@@ -1,4 +1,4 @@
-Acme\Bundle\AppEEBundle\Model\ProductValue:
+Pim\Bundle\ExtendedEeBundle\Model\ProductValue:
     type: entity
     table: pim_catalog_product_value
     changeTrackingPolicy: DEFERRED_EXPLICIT
diff --git a/doc/example/Acme/Bundle/AppEEBundle/Resources/config/model/doctrine/PublishedProductValue.mongodb.yml b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/model/doctrine/PublishedProductValue.mongodb.yml
similarity index 59%
rename from doc/example/Acme/Bundle/AppEEBundle/Resources/config/model/doctrine/PublishedProductValue.mongodb.yml
rename to doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/model/doctrine/PublishedProductValue.mongodb.yml
index 11ddc6f..b58d6e8 100644
--- a/doc/example/Acme/Bundle/AppEEBundle/Resources/config/model/doctrine/PublishedProductValue.mongodb.yml
+++ b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/model/doctrine/PublishedProductValue.mongodb.yml
@@ -1,4 +1,4 @@
-Acme\Bundle\AppEEBundle\Model\PublishedProductValue:
+Pim\Bundle\ExtendedEeBundle\Model\PublishedProductValue:
     type: embeddedDocument
     fields:
         textCollection:
diff --git a/doc/example/Acme/Bundle/AppEEBundle/Resources/config/model/doctrine/PublishedProductValue.orm.yml b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/model/doctrine/PublishedProductValue.orm.yml
similarity index 90%
rename from doc/example/Acme/Bundle/AppEEBundle/Resources/config/model/doctrine/PublishedProductValue.orm.yml
rename to doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/model/doctrine/PublishedProductValue.orm.yml
index 0302189..f8b7916 100644
--- a/doc/example/Acme/Bundle/AppEEBundle/Resources/config/model/doctrine/PublishedProductValue.orm.yml
+++ b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/model/doctrine/PublishedProductValue.orm.yml
@@ -1,4 +1,4 @@
-Acme\Bundle\AppEEBundle\Model\PublishedProductValue:
+Pim\Bundle\ExtendedEeBundle\Model\PublishedProductValue:
     type: entity
     table: pimee_workflow_published_product_value
     changeTrackingPolicy: DEFERRED_EXPLICIT
diff --git a/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/parameters_test.yml b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/parameters_test.yml
new file mode 100644
index 0000000..aded781
--- /dev/null
+++ b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/parameters_test.yml
@@ -0,0 +1,10 @@
+parameters:
+    database_driver: pdo_mysql
+    database_host: mysql
+    database_port: null
+    database_name: akeneo_pim
+    database_user: akeneo_pim
+    database_password: akeneo_pim
+    locale: en
+    secret: ThisTokenIsNotSoSecretChangeIt
+    installer_data:       PimEnterpriseInstallerBundle:minimal
diff --git a/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/storage_driver/orm/orm.yml b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/storage_driver/orm/orm.yml
new file mode 100644
index 0000000..8539ad7
--- /dev/null
+++ b/doc/example/Pim/Bundle/ExtendedEeBundle/Resources/config/storage_driver/orm/orm.yml
@@ -0,0 +1,2 @@
+parameters:
+    pim_catalog.doctrine.completeness_generator.class: Pim\Bundle\ExtendedEeBundle\Doctrine\ORM\EECompletenessGenerator
diff --git a/spec/Pim/Bundle/ExtendedAttributeTypeBundle/ArrayConverter/StandardToFlat/Product/ValueConverter/TextCollectionConverterSpec.php b/spec/Pim/Bundle/ExtendedAttributeTypeBundle/ArrayConverter/StandardToFlat/Product/ValueConverter/TextCollectionConverterSpec.php
index 7ecf116..ba4655c 100644
--- a/spec/Pim/Bundle/ExtendedAttributeTypeBundle/ArrayConverter/StandardToFlat/Product/ValueConverter/TextCollectionConverterSpec.php
+++ b/spec/Pim/Bundle/ExtendedAttributeTypeBundle/ArrayConverter/StandardToFlat/Product/ValueConverter/TextCollectionConverterSpec.php
@@ -3,7 +3,6 @@
 namespace spec\Pim\Bundle\ExtendedAttributeTypeBundle\ArrayConverter\StandardToFlat\Product\ValueConverter;
 
 use PhpSpec\ObjectBehavior;
-use Pim\Bundle\ExtendedAttributeTypeBundle\AttributeType\ExtendedAttributeTypes;
 use Pim\Component\Connector\ArrayConverter\FlatToStandard\Product\AttributeColumnsResolver;
 use Prophecy\Argument;
 
diff --git a/spec/Pim/Bundle/ExtendedAttributeTypeBundle/Completeness/Checker/TextCollectionCompleteCheckerSpec.php b/spec/Pim/Bundle/ExtendedAttributeTypeBundle/Completeness/Checker/TextCollectionCompleteCheckerSpec.php
index 3613c65..10bdb1c 100644
--- a/spec/Pim/Bundle/ExtendedAttributeTypeBundle/Completeness/Checker/TextCollectionCompleteCheckerSpec.php
+++ b/spec/Pim/Bundle/ExtendedAttributeTypeBundle/Completeness/Checker/TextCollectionCompleteCheckerSpec.php
@@ -3,7 +3,6 @@
 namespace spec\Pim\Bundle\ExtendedAttributeTypeBundle\Completeness\Checker;
 
 use PhpSpec\ObjectBehavior;
-use Pim\Bundle\EnrichBundle\Form\Type\AttributeType;
 use Pim\Bundle\ExtendedAttributeTypeBundle\AttributeType\ExtendedAttributeTypes;
 use Pim\Component\Catalog\Model\AttributeInterface;
 use Pim\Component\Catalog\Model\ChannelInterface;
diff --git a/src/Filter/ProductValue/TextCollectionFilter.php b/src/Filter/ProductValue/TextCollectionFilter.php
index 2ae8e29..af1fc3f 100644
--- a/src/Filter/ProductValue/TextCollectionFilter.php
+++ b/src/Filter/ProductValue/TextCollectionFilter.php
@@ -4,7 +4,7 @@
 
 use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType;
 use Oro\Bundle\FilterBundle\Form\Type\Filter\TextFilterType;
-use Pim\Bundle\ExtendedAttributeTypeBundle\Form\Type\Filter\TextCollectionFilterType;
+use Pim\Bundle\ExtendedAttributeTypeBundle\DataGrid\Form\Type\Filter\TextCollectionFilterType;
 use Pim\Bundle\FilterBundle\Filter\ProductValue\StringFilter;
 use Pim\Component\Catalog\Query\Filter\Operators;