diff --git a/package.json b/package.json
index 3c1f9b5..09271f0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grunt-closure-compiler",
   "description": "A Grunt task for Closure Compiler.",
-  "version": "0.0.13",
+  "version": "2.2.0",
   "homepage": "https://github.com/gmarty/grunt-closure-compiler",
   "author": {
     "name": "Guillaume Marty",
@@ -31,10 +31,10 @@
     "test": "grunt test"
   },
   "dependencies": {
-    "grunt": "~0.3.7"
+    "grunt": "~0.4.0"
   },
   "devDependencies": {
-    "grunt": "~0.3.7"
+    "grunt": "~0.4.0"
   },
   "keywords": [
     "Closure Compiler",
diff --git a/tasks/closure-compiler.js b/tasks/closure-compiler.js
index f71108a..f0acdfc 100644
--- a/tasks/closure-compiler.js
+++ b/tasks/closure-compiler.js
@@ -14,7 +14,7 @@ module.exports = function(grunt) {
 
     var closurePath = '',
         reportFile = '',
-        data = this.data,
+        data = grunt.config.get(this.name)[this.target],
         done = this.async();
 
     // Check for closure path.
@@ -33,8 +33,7 @@ module.exports = function(grunt) {
     }
 
     var command = 'java -jar ' + closurePath + '/build/compiler.jar';
-
-    data.js = grunt.file.expandFiles(data.js);
+    data.js = grunt.file.expand(data.js, 'isFile');
 
     // Sanitize options passed.
     if (!data.js.length) {
@@ -52,7 +51,7 @@ module.exports = function(grunt) {
     }
 
     if (data.externs) {
-      data.externs = grunt.file.expandFiles(data.externs);
+      data.externs = grunt.file.expand(data.externs, 'isFile');
       command += ' --externs ' + data.externs.join(' --externs ');
 
       if (!data.externs.length) {