diff --git a/.eslintrc b/.eslintrc
index b304c51..adb8925 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -46,7 +46,6 @@
     "no-dupe-keys": 2,
     "no-duplicate-case": 2,
     "no-empty-character-class": 2,
-    "no-empty-label": 2,
     "no-eval": 2,
     "no-ex-assign": 2,
     "no-extend-native": 2,
@@ -103,7 +102,7 @@
     "quotes": [2, "single", "avoid-escape"],
     "radix": 2,
     "semi": [2, "always"],
-    "space-after-keywords": [2, "always"],
+    "keyword-spacing": 2,
     "space-before-blocks": [2, "always"],
     "space-before-function-paren": [2, {
         "anonymous": "always",
@@ -111,7 +110,6 @@
     }],
     "space-in-parens": [2, "never"],
     "space-infix-ops": 2,
-    "space-return-throw-case": 2,
     "space-unary-ops": [2, { "words": true, "nonwords": false }],
     "spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }],
     "use-isnan": 2,
diff --git a/.travis.yml b/.travis.yml
index ae7e155..911d65a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,16 @@ language: node_js
 sudo: false
 
 node_js:
-    - "iojs-v2.4.0"
-    - "iojs-v3.1.0"
-    - "iojs-v3.2.0"
+    - "5.7"
+    - "5.6"
+    - "5.5"
+    - "5.4"
+    - "5.3"
+    - "5.2"
+    - "5.1"
+    - "5.0"
+    - "4.3"
+    - "4.2"
     - "0.12"
 
 script:
diff --git a/package.json b/package.json
index 343f7da..c5e16e6 100644
--- a/package.json
+++ b/package.json
@@ -25,15 +25,15 @@
   "author": "Armand Abric <armand@forgebinaire.net>",
   "license": "MIT",
   "devDependencies": {
-    "chai": "~3.2.0",
-    "coveralls": "~2.11.4",
-    "eslint": "~1.3.1",
-    "istanbul": "~0.3.19",
-    "mocha": "~2.3.0",
-    "sinon": "~1.16.1",
+    "chai": "~3.5.0",
+    "coveralls": "~2.11.6",
+    "eslint": "~2.2.0",
+    "istanbul": "~0.4.2",
+    "mocha": "~2.4.5",
+    "sinon": "~1.17.3",
     "sinon-chai": "~2.8.0"
   },
   "dependencies": {
-    "lodash": "~3.10.1"
+    "lodash": "~4.5.1"
   }
 }
diff --git a/src/CallCollection.js b/src/CallCollection.js
index 1d8f15a..a621ea6 100644
--- a/src/CallCollection.js
+++ b/src/CallCollection.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var each = require('lodash/collection/each');
+var each = require('lodash/each');
 var Call = require('./Call');
 
 /**
diff --git a/src/ContainerFactory.js b/src/ContainerFactory.js
index aebfe28..ba75e54 100644
--- a/src/ContainerFactory.js
+++ b/src/ContainerFactory.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var each = require('lodash/collection/each');
+var each = require('lodash/each');
 var Call = require('./Call');
 var CallCollection = require('./CallCollection');
 var Container = require('./Container');
diff --git a/src/FunctionArgumentCollection.js b/src/FunctionArgumentCollection.js
index e5c7d33..abdfc38 100644
--- a/src/FunctionArgumentCollection.js
+++ b/src/FunctionArgumentCollection.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var each = require('lodash/collection/each');
+var each = require('lodash/each');
 var FunctionArgument = require('./FunctionArgument');
 
 /**
diff --git a/src/ParameterCollection.js b/src/ParameterCollection.js
index 0003737..b746fed 100644
--- a/src/ParameterCollection.js
+++ b/src/ParameterCollection.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var each = require('lodash/collection/each');
-var find = require('lodash/collection/find');
+var each = require('lodash/each');
+var find = require('lodash/find');
 var Parameter = require('./Parameter');
 
 /**
diff --git a/src/ServiceDefinitionCollection.js b/src/ServiceDefinitionCollection.js
index 71fcd5f..8e83eb1 100644
--- a/src/ServiceDefinitionCollection.js
+++ b/src/ServiceDefinitionCollection.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var each = require('lodash/collection/each');
-var find = require('lodash/collection/find');
+var each = require('lodash/each');
+var find = require('lodash/find');
 var ServiceDefinition = require('./ServiceDefinition');
 var ObjectHelper = require('./ObjectHelper');