diff --git a/composer.json b/composer.json
index eef846bd..f28562b3 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,10 @@
         "se/selenium-server-standalone": "^2.52",
         "sylius-labs/coding-standard": "^1.0",
         "symplify/easy-coding-standard": "^2.4",
-        "nelmio/alice": "^3.3"
+        "nelmio/alice": "^3.3",
+        "symfony/web-server-bundle": "^3.4|^4.1",
+        "symfony/web-profiler-bundle": "^3.4|^4.1",
+        "symfony/debug-bundle": "^3.4|^4.1"
     },
     "prefer-stable": true,
     "autoload": {
diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
index f9c2f845..0c55b1d6 100644
--- a/src/Resources/config/services.yml
+++ b/src/Resources/config/services.yml
@@ -10,6 +10,8 @@ services:
             - "@translator"
             - "@router"
             - "%wishlist_cookie_token%"
+        tags:
+            - { name: controller.service_arguments }
 
     bitbag_sylius_wishlist_plugin.controller.action.remove_product_from_wishlist:
         class: BitBag\SyliusWishlistPlugin\Controller\Action\RemoveProductFromWishlistAction
@@ -20,6 +22,8 @@ services:
             - "@session.flash_bag"
             - "@translator"
             - "@router"
+        tags:
+            - { name: controller.service_arguments }
 
     bitbag_sylius_wishlist_plugin.controller.action.list_wishlist_products:
         class: BitBag\SyliusWishlistPlugin\Controller\Action\ListWishlistProductsAction
@@ -32,12 +36,16 @@ services:
             - "@session.flash_bag"
             - "@translator"
             - "@templating.engine.twig"
+        tags:
+            - { name: controller.service_arguments }
 
     bitbag_sylius_wishlist_plugin.controller.action.render_header_template:
         class: BitBag\SyliusWishlistPlugin\Controller\Action\RenderHeaderTemplateAction
         arguments:
             - "@bitbag_sylius_wishlist_plugin.context.wishlist"
             - "@templating.engine.twig"
+        tags:
+            - { name: controller.service_arguments }
 
     bitbag_sylius_wishlist_plugin.context.wishlist:
         class: BitBag\SyliusWishlistPlugin\Context\WishlistContext