diff --git a/Resources/config/pdf.xml b/Resources/config/pdf.xml
index 266d5cf..1ea2904 100644
--- a/Resources/config/pdf.xml
+++ b/Resources/config/pdf.xml
@@ -20,9 +20,12 @@
 	</parameters>
 
     <services>
-    	<service id="ps_pdf.facade" class="PHPPdf\Core\Facade" />
+        <service id="ps_pdf.facade" class="PHPPdf\Core\Facade">
+            <factory service="ps_pdf.facade_builder" method="build" />
+        </service>
     	
-    	<service id="ps_pdf.facade_builder" class="PHPPdf\Core\FacadeBuilder">
+        <service id="ps_pdf.facade_builder" class="PHPPdf\Core\FacadeBuilder">
+                <factory class="PHPPdf\Core\FacadeBuilder" method="create" />
     		<argument type="service">
 		    	<service class="PHPPdf\Core\Configuration\LoaderImpl">
 		    		<argument>%ps_pdf.nodes_file%</argument>
@@ -59,17 +62,14 @@
     	<service id="ps_pdf.listener" class="Ps\PdfBundle\EventListener\PdfListener">
     		<tag name="kernel.event_listener" event="kernel.controller" method="onKernelController" priority="1000" />
     		<tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" priority="1000" />
+    		<tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" />
     		<argument id="ps_pdf.facade_builder" type="service" />
     		<argument id="annotation_reader" type="service" />
     		<argument id="ps_pdf.reflection_factory" type="service" />
     		<argument id="templating" type="service" />
     		<argument id="ps_pdf.cache" type="service" />
     	</service>
-
-        <service id="ps_pdf.request_listener" class="Ps\PdfBundle\EventListener\PdfRequestListener">
-            <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" />
-        </service>
-
+    	
     	<service id="ps_pdf.reflection_factory" class="Ps\PdfBundle\Reflection\Factory" public="false" />
     	
     	<service id="ps_pdf.twig.pdf_extension" class="Ps\PdfBundle\Twig\Extensions\Extension\PdfExtension" public="false">
@@ -86,4 +86,4 @@
     		<argument>%ps_pdf.cache.options%</argument>
     	</service>
     </services>
-</container>
\ No newline at end of file
+</container>