diff --git a/composer.lock b/composer.lock
index db49155..99d6e13 100644
--- a/composer.lock
+++ b/composer.lock
@@ -229,6 +229,7 @@
                 "request",
                 "response"
             ],
+            "abandoned": "http-interop/http-server-middleware",
             "time": "2017-01-14T15:23:42+00:00"
         },
         {
@@ -332,16 +333,16 @@
         },
         {
             "name": "travello-gmbh/amazon-alexa-skill-library",
-            "version": "2.2.8",
+            "version": "2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/travello-gmbh/amazon-alexa-skill-library.git",
-                "reference": "bcf36450367a6b433d584b670673a96f286eb784"
+                "reference": "9fda9ae5385e61a14999259879bcd31d38b5b0f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/travello-gmbh/amazon-alexa-skill-library/zipball/bcf36450367a6b433d584b670673a96f286eb784",
-                "reference": "bcf36450367a6b433d584b670673a96f286eb784",
+                "url": "https://api.github.com/repos/travello-gmbh/amazon-alexa-skill-library/zipball/9fda9ae5385e61a14999259879bcd31d38b5b0f5",
+                "reference": "9fda9ae5385e61a14999259879bcd31d38b5b0f5",
                 "shasum": ""
             },
             "require": {
@@ -368,7 +369,7 @@
             ],
             "description": "PHP Library for Amazon Alexa Skills ",
             "homepage": "https://www.travello.audio",
-            "time": "2017-11-06T05:03:37+00:00"
+            "time": "2017-11-26T09:30:38+00:00"
         },
         {
             "name": "webimpress/composer-extra-dependency",
@@ -1078,16 +1079,16 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.7.2",
+            "version": "1.7.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6"
+                "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
-                "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
+                "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
                 "shasum": ""
             },
             "require": {
@@ -1099,7 +1100,7 @@
             },
             "require-dev": {
                 "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8 || ^5.6.5"
+                "phpunit/phpunit": "^4.8.35 || ^5.7"
             },
             "type": "library",
             "extra": {
@@ -1137,7 +1138,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2017-09-04T11:05:03+00:00"
+            "time": "2017-11-24T13:59:53+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -1205,16 +1206,16 @@
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.4.2",
+            "version": "1.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
+                "reference": "8ebba84e5bd74fc5fdeb916b38749016c7232f93"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/8ebba84e5bd74fc5fdeb916b38749016c7232f93",
+                "reference": "8ebba84e5bd74fc5fdeb916b38749016c7232f93",
                 "shasum": ""
             },
             "require": {
@@ -1248,7 +1249,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2016-10-03T07:40:28+00:00"
+            "time": "2017-11-24T15:00:59+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -1391,16 +1392,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "6.4.3",
+            "version": "6.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "06b28548fd2b4a20c3cd6e247dc86331a7d4db13"
+                "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/06b28548fd2b4a20c3cd6e247dc86331a7d4db13",
-                "reference": "06b28548fd2b4a20c3cd6e247dc86331a7d4db13",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/562f7dc75d46510a4ed5d16189ae57fbe45a9932",
+                "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932",
                 "shasum": ""
             },
             "require": {
@@ -1471,7 +1472,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-10-16T13:18:59+00:00"
+            "time": "2017-11-08T11:26:09+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
diff --git a/src/Application/AlexaApplicationFactory.php b/src/Application/AlexaApplicationFactory.php
index b2159c7..485f1af 100644
--- a/src/Application/AlexaApplicationFactory.php
+++ b/src/Application/AlexaApplicationFactory.php
@@ -41,11 +41,10 @@ public function __invoke(
         $alexaRequest       = $container->get(AlexaRequest::class);
         $alexaResponse      = $container->get(AlexaResponse::class);
         $intentManager      = $container->get(IntentManager::class);
-        $skillConfiguration = $container->get(SkillConfiguration::class);
 
         /** @var AlexaApplication $alexaApplication */
         $alexaApplication = new $requestedName(
-            $alexaRequest, $alexaResponse, $intentManager, $skillConfiguration
+            $alexaRequest, $alexaResponse, $intentManager
         );
 
         return $alexaApplication;
diff --git a/src/Intent/AbstractIntentFactory.php b/src/Intent/AbstractIntentFactory.php
index 90220e6..97b7d5c 100644
--- a/src/Intent/AbstractIntentFactory.php
+++ b/src/Intent/AbstractIntentFactory.php
@@ -13,6 +13,7 @@
 
 use Interop\Container\ContainerInterface;
 use TravelloAlexaLibrary\Configuration\SkillConfiguration;
+use TravelloAlexaLibrary\Intent\AbstractIntent;
 use TravelloAlexaLibrary\Intent\IntentInterface;
 use TravelloAlexaLibrary\Request\AlexaRequest;
 use TravelloAlexaLibrary\Response\AlexaResponse;
@@ -47,8 +48,8 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         /** @var TextHelper $textHelper */
         $textHelper = $container->get($skillConfiguration->getTextHelperClass());
 
-        /** @var IntentInterface $intent */
-        $intent = new $requestedName($alexaRequest, $alexaResponse, $textHelper);
+        /** @var AbstractIntent $intent */
+        $intent = new $requestedName($alexaRequest, $alexaResponse, $textHelper, $skillConfiguration);
 
         return $intent;
     }