diff --git a/src/BeSimple/SoapBundle/ServiceDefinition/Loader/AnnotationClassLoader.php b/src/BeSimple/SoapBundle/ServiceDefinition/Loader/AnnotationClassLoader.php
index 649cb20..dcd1500 100644
--- a/src/BeSimple/SoapBundle/ServiceDefinition/Loader/AnnotationClassLoader.php
+++ b/src/BeSimple/SoapBundle/ServiceDefinition/Loader/AnnotationClassLoader.php
@@ -88,7 +88,6 @@ class AnnotationClassLoader extends Loader
 
                     $serviceMethod = new Definition\Method(
                         $annotation->getValue(),
-                        $this->typeRepository,
                         $this->getController($class, $method, $annotation)
                     );
                 } elseif ($annotation instanceof Annotation\Result) {
diff --git a/src/BeSimple/SoapBundle/ServiceDefinition/Method.php b/src/BeSimple/SoapBundle/ServiceDefinition/Method.php
index 9d3f593..a93953c 100644
--- a/src/BeSimple/SoapBundle/ServiceDefinition/Method.php
+++ b/src/BeSimple/SoapBundle/ServiceDefinition/Method.php
@@ -23,9 +23,9 @@ class Method extends BaseMethod
 {
     private $controller;
 
-    public function __construct($name, TypeRepository $typeRepository, $controller)
+    public function __construct($name, $controller)
     {
-        parent::__construct($name, $typeRepository);
+        parent::__construct($name);
 
         $this->controller = $controller;
     }
diff --git a/src/BeSimple/SoapCommon/Definition/Method.php b/src/BeSimple/SoapCommon/Definition/Method.php
index a592e6a..e79e9d2 100644
--- a/src/BeSimple/SoapCommon/Definition/Method.php
+++ b/src/BeSimple/SoapCommon/Definition/Method.php
@@ -26,14 +26,14 @@ class Method
     private $output;
     private $fault;
 
-    public function __construct($name, TypeRepository $typeRepository)
+    public function __construct($name)
     {
         $this->name = $name;
 
-        $this->headers = new Message($name.'Header', $typeRepository);
-        $this->input = new Message($name.'Request', $typeRepository);
-        $this->output = new Message($name.'Response', $typeRepository);
-        $this->fault = new Message($name.'Fault', $typeRepository);
+        $this->headers = new Message($name.'Header');
+        $this->input = new Message($name.'Request');
+        $this->output = new Message($name.'Response');
+        $this->fault = new Message($name.'Fault');
     }
 
     public function getName()