diff --git a/DependencyInjection/InfiniteFormExtension.php b/DependencyInjection/InfiniteFormExtension.php
index 975e0db..76b444c 100644
--- a/DependencyInjection/InfiniteFormExtension.php
+++ b/DependencyInjection/InfiniteFormExtension.php
@@ -12,6 +12,7 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
@@ -47,5 +48,14 @@ public function load(array $configs, ContainerBuilder $container)
         if ($configs['twig']) {
             $loader->load('twig.xml');
         }
+
+        $attachmentDefinition = $container->getDefinition('infinite_form.attachment.form_type');
+
+        if (method_exists($attachmentDefinition, 'setFactory')) {
+            $attachmentDefinition->setFactory(array(new Reference('doctrine'), 'getManager'));
+        } else {
+            $attachmentDefinition->setFactoryService('doctrine');
+            $attachmentDefinition->setFactoryMethod('getManager');
+        }
     }
 }
diff --git a/Resources/config/attachment.xml b/Resources/config/attachment.xml
index 38695b9..dbe90c4 100644
--- a/Resources/config/attachment.xml
+++ b/Resources/config/attachment.xml
@@ -42,7 +42,9 @@
         <service id="infinite_form.attachment.form_type" class="%infinite_form.attachment.attachment_type.class%">
             <argument>%infinite_form.attachment.default_secret%</argument>
             <argument type="service">
-                <service class="Doctrine\Common\Persistence\ObjectManager" factory-service="doctrine" factory-method="getManager" public="false">
+                <service class="Doctrine\Common\Persistence\ObjectManager" public="false">
+                    <!-- Added in extension class -->
+                    <!--<factory service="doctrine" method="getManager"/>-->
                     <argument>%infinite_form.attachment.entity_manager%</argument>
                 </service>
             </argument>