diff --git a/.travis.yml b/.travis.yml
index da0627dfbd..5e62ccb8e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ matrix:
     allow_failures:
         - php: 5.5
 
-before_script: 
+before_script:
     - echo 'xdebug.max_nesting_level=9999' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
     - sudo apt-get update > /dev/null
     - sudo apt-get install -y --force-yes apache2 libapache2-mod-php5 php5-curl php5-mysql php5-intl
@@ -18,7 +18,7 @@ before_script:
     - echo "127.0.0.1 sylius.local" | sudo tee -a /etc/hosts
     - sudo /etc/init.d/apache2 restart
     - composer self-update
-    - composer install --dev --prefer-source > /dev/null
+    - composer install --dev --prefer-source --no-interaction > /dev/null
     - sylius/console do:da:cr -e=test > /dev/null
     - sylius/console do:sc:cr -e=test > /dev/null
     - chmod -R 777 sylius/cache sylius/logs
diff --git a/composer.json b/composer.json
index 9ffec3af2b..3c3809ed1d 100644
--- a/composer.json
+++ b/composer.json
@@ -18,20 +18,20 @@
         }
     ],
     "require": {
-        "php":                               ">=5.3.3",
-        "symfony/symfony":                   ">=2.2,<2.3-dev",
-        "doctrine/orm":                      ">=2.2.3,<2.4-dev",
-        "doctrine/doctrine-bundle":          "1.2.*",
-        "doctrine/doctrine-fixtures-bundle": "*",
-        "twig/extensions":                   "1.0.*",
-        "symfony/assetic-bundle":            "2.1.*",
-        "symfony/swiftmailer-bundle":        "2.2.*",
-        "symfony/monolog-bundle":            "2.2.*",
-        "sensio/distribution-bundle":        "2.2.*",
-
-        "sylius/core-bundle":                "0.1.*",
-        "sylius/web-bundle":                 "0.1.*",
-        "mathiasverraes/money": "dev-master@dev"
+        "php":                                  ">=5.3.3",
+        "symfony/symfony":                      ">=2.2,<2.3-dev",
+        "doctrine/orm":                         ">=2.2.3,<2.4-dev",
+        "doctrine/doctrine-bundle":             "1.2.*",
+        "doctrine/doctrine-fixtures-bundle":    "*",
+        "twig/extensions":                      "1.0.*",
+        "symfony/assetic-bundle":               "2.1.*",
+        "symfony/swiftmailer-bundle":           "2.2.*",
+        "symfony/monolog-bundle":               "2.2.*",
+        "sensio/distribution-bundle":           "2.2.*",
+        "incenteev/composer-parameter-handler": "~2.0",
+        "mathiasverraes/money":                 "dev-master@dev",
+        "sylius/core-bundle":                   "0.1.*",
+        "sylius/web-bundle":                    "0.1.*"
     },
     "require-dev": {
         "behat/behat":                       "2.4.*",
@@ -43,14 +43,14 @@
     },
     "scripts": {
         "post-install-cmd": [
-            "Sylius\\Bundle\\CoreBundle\\Composer\\ScriptHandler::installParametersFile",
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
         ],
         "post-update-cmd": [
-            "Sylius\\Bundle\\CoreBundle\\Composer\\ScriptHandler::installParametersFile",
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
@@ -66,6 +66,9 @@
     "minimum-stability": "dev",
     "extra": {
         "symfony-app-dir": "sylius",
-        "symfony-web-dir": "web"
+        "symfony-web-dir": "web",
+        "incenteev-parameters": {
+            "file": "sylius/config/container/parameters.yml"
+        }
     }
 }
diff --git a/composer.lock b/composer.lock
index 9e94454c0f..80c4c0df57 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,5 +1,5 @@
 {
-    "hash": "9dc925fb39fd8ecfdda3143a0a64463e",
+    "hash": "79445aa424a3f9dd7149ad443a3d41b0",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -1133,6 +1133,56 @@
             ],
             "time": "2012-12-13 18:31:18"
         },
+        {
+            "name": "incenteev/composer-parameter-handler",
+            "version": "dev-master",
+            "target-dir": "Incenteev/ParameterHandler",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Incenteev/ParameterHandler.git",
+                "reference": "ec4c32c8dbd9e571165de244aff249a3ecea7102"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/ec4c32c8dbd9e571165de244aff249a3ecea7102",
+                "reference": "ec4c32c8dbd9e571165de244aff249a3ecea7102",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/yaml": ">=2.0,<3.0"
+            },
+            "require-dev": {
+                "composer/composer": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Incenteev\\ParameterHandler": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christophe Coevoet",
+                    "email": "stof@notk.org"
+                }
+            ],
+            "description": "Composer script handling your ignored parameter file",
+            "homepage": "https://github.com/Incenteev/ParameterHandler",
+            "keywords": [
+                "parameters management"
+            ],
+            "time": "2013-04-06 17:40:18"
+        },
         {
             "name": "jdorn/sql-formatter",
             "version": "dev-master",
@@ -1189,7 +1239,7 @@
             "target-dir": "JMS/AopBundle",
             "source": {
                 "type": "git",
-                "url": "https://github.com/schmittjoh/JMSAopBundle.git",
+                "url": "https://github.com/schmittjoh/JMSAopBundle",
                 "reference": "7018357f5bedf204979a88867a9da05973744422"
             },
             "dist": {
@@ -1402,7 +1452,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/schmittjoh/parser-lib.git",
+                "url": "git://github.com/schmittjoh/parser-lib",
                 "reference": "4d469a70c6dd03f921cbdeadafbcb261bb23e8b0"
             },
             "dist": {
@@ -1707,7 +1757,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/KnpLabs/KnpMenu.git",
+                "url": "http://github.com/KnpLabs/KnpMenu.git",
                 "reference": "730bc37232f5f813822acf80edfbd89381ea5971"
             },
             "dist": {
@@ -2807,6 +2857,9 @@
                 "phpspec/phpspec2": "dev-develop",
                 "twig/twig": "*"
             },
+            "suggest": {
+                "friendsofsymfony/rest-bundle": "*"
+            },
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {