diff --git a/DependencyInjection/ElaoJsonHttpFormExtension.php b/DependencyInjection/ElaoJsonHttpFormExtension.php
index a7d3721..4e1ab2d 100644
--- a/DependencyInjection/ElaoJsonHttpFormExtension.php
+++ b/DependencyInjection/ElaoJsonHttpFormExtension.php
@@ -21,6 +21,10 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $this->processConfiguration($configuration, $configs);
 
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('forms.xml');
+
+        $container->setParameter(
+            'form.type_extension.form.request_handler.class',
+            'Elao\Bundle\JsonHttpFormBundle\Form\RequestHandler\JsonHttpFoundationRequestHandler'
+        );
     }
 }
diff --git a/Form/Extension/FormTypeJsonHttpFoundationExtension.php b/Form/Extension/FormTypeJsonHttpFoundationExtension.php
deleted file mode 100644
index 8a739aa..0000000
--- a/Form/Extension/FormTypeJsonHttpFoundationExtension.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Elao\Bundle\JsonHttpFormBundle\Form\Extension;
-
-use Symfony\Component\Form\AbstractTypeExtension;
-use Symfony\Component\Form\RequestHandlerInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Elao\Bundle\JsonHttpFormBundle\Form\RequestHandler\JsonHttpFoundationRequestHandler;
-
-/**
- * Form type extension for Json Http Foundation request handler
- */
-class FormTypeJsonHttpFoundationExtension extends AbstractTypeExtension
-{
-    /**
-     * @var RequestHandlerInterface
-     */
-    private $requestHandler;
-
-    /**
-     * @param RequestHandlerInterface $requestHandler
-     */
-    public function __construct(RequestHandlerInterface $requestHandler = null)
-    {
-        $this->requestHandler = $requestHandler ?: new JsonHttpFoundationRequestHandler();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder->setRequestHandler($this->requestHandler);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getExtendedType()
-    {
-        return 'form';
-    }
-}
diff --git a/Resources/config/forms.xml b/Resources/config/forms.xml
deleted file mode 100644
index 57f5dae..0000000
--- a/Resources/config/forms.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-    <parameters>
-        <parameter key="elao_json_http_form.type_extension.form.request_handler.class">Elao\Bundle\JsonHttpFormBundle\Form\RequestHandler\JsonHttpFoundationRequestHandler</parameter>
-    </parameters>
-
-    <services>
-        <!-- FormTypeHttpFoundationExtension -->
-        <service id="elao_json_http_form.type_extension.form.json_http_foundation" class="Elao\Bundle\JsonHttpFormBundle\Form\Extension\FormTypeJsonHttpFoundationExtension">
-            <argument type="service" id="elao_json_http_form.type_extension.form.request_handler" />
-            <tag name="form.type_extension" alias="form" />
-        </service>
-
-        <!-- HttpFoundationRequestHandler -->
-        <service id="elao_json_http_form.type_extension.form.request_handler" class="%elao_json_http_form.type_extension.form.request_handler.class%" public="false" />
-    </services>
-</container>
diff --git a/composer.json b/composer.json
index da8d2c3..fc2f68c 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.3.x-dev"
+            "dev-master": "1.0.x-dev"
         }
     }
 }