diff --git a/DependencyInjection/WebServiceExtension.php b/DependencyInjection/WebServiceExtension.php
index 0fa0ea2..872e3b2 100644
--- a/DependencyInjection/WebServiceExtension.php
+++ b/DependencyInjection/WebServiceExtension.php
@@ -25,11 +25,13 @@ class WebServiceExtension extends Extension
     {
         if(!$configuration->hasDefinition('webservice_http_kernel'))
         {
-            $loader = new XmlFileLoader($configuration, __DIR__ . "/../Resources/config");
-            $loader->load("services.xml");
+            $loader = new XmlFileLoader($configuration, __DIR__ . '/../Resources/config');
+            $loader->load('services.xml');
 
-            $configuration->setAlias("http_kernel", "webservice_http_kernel");
+            $configuration->setAlias('http_kernel', 'webservice_http_kernel');
         }
+
+        $configuration->setParameter('webservice.config.wsdl', $config['wsdl']);
     }
 
     public function getXsdValidationBasePath()
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 64da6a4..6845e72 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
 	<parameters>
-		<parameter key="request.class">Bundle\WebServiceBundle\SoapRequest</parameter>
+		<parameter key="request.class">Bundle\WebServiceBundle\Soap\SoapRequest</parameter>
 	</parameters>
 	
 	<services>
@@ -14,8 +14,8 @@
             <argument type="service" id="controller_resolver" />
         </service>
         
-		<service id="webservice_soap_server" class="\SoapServer">
-			<argument type="string" key="%webservice.config.wsdl%" />
+		<service id="webservice_soap_server" class="SoapServer">
+			<argument type="string">%webservice.config.wsdl%</argument>
 		</service>
 		<service id="webservice_http_kernel" class="Bundle\WebServiceBundle\SoapKernel">
             <argument type="service" id="webservice_soap_server" />