diff --git a/.travis.yml b/.travis.yml
index eb13a44..8b46667 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,8 @@ matrix:
     include:
       - php: 7.1
       - php: 7.2
+    allow_failures:
+      - php: 7.2
 
 before_install:
     # disable default memory limit
diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md
index 30bbddf..f15c6ab 100644
--- a/CHANGELOG-2.1.md
+++ b/CHANGELOG-2.1.md
@@ -1,3 +1,9 @@
+# 2.1.5
+
+## Bug fixes
+
+ - Fixes issue saving Akeneo AttributeOptions. #28
+
 # 2.1.2
 
 ## Bug fixes
diff --git a/README.md b/README.md
index 94aff8b..fdb043a 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ All product information related to attributes of type _table_ will be imported/e
 Simply install the package with the following command: 
 
 ``` bash
-composer require flagbit/table-attribute-bundle
+composer require flagbit/table-attribute-bundle:^2.1@stable
 ```
 
 ### Enable the bundle
diff --git a/composer.json b/composer.json
index b9bd20a..8ea97ac 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
     }
   ],
   "require": {
-    "akeneo/pim-community-dev": "^2.0.5"
+    "akeneo/pim-community-dev": "^2.3.41"
   },
   "require-dev": {
     "phpspec/phpspec": "^4.2",
diff --git a/src/Form/Extension/AttributeOptionTypeExtension.php b/src/Form/Extension/AttributeOptionTypeExtension.php
index 69cc926..e739f7c 100644
--- a/src/Form/Extension/AttributeOptionTypeExtension.php
+++ b/src/Form/Extension/AttributeOptionTypeExtension.php
@@ -3,6 +3,7 @@
 namespace Flagbit\Bundle\TableAttributeBundle\Form\Extension;
 
 use Pim\Bundle\EnrichBundle\Form\Type\AttributeOptionType;
+use Pim\Bundle\FilterBundle\Form\Type\UnstructuredType;
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -26,8 +27,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 new Choice(['select', 'select_from_url', 'text', 'number']),
             ],
         ]);
-        $builder->add('constraints', TextType::class, ['required' => true]);
-        $builder->add('type_config', TextType::class, ['required' => true]);
+        $builder->add('constraints', UnstructuredType::class, ['required' => true]);
+        $builder->add('type_config', UnstructuredType::class, ['required' => true]);
     }
 
     /**