diff --git a/composer.json b/composer.json
index 5d6639a9f861dca9ad88466acfa8fb9be604b291..f68b6d8516b210abb07b1756e4f2a0aeb5d3d2f2 100644
--- a/composer.json
+++ b/composer.json
@@ -12,18 +12,20 @@
     ],
     "require": {
         "php": ">=5.4",
-        "symfony/serializer": "~2.7",
-        "elasticsearch/elasticsearch": "~1.0"
+        "symfony/serializer": "~2.7"
     },
     "require-dev": {
-        "mikey179/vfsStream": "~1.4",
         "phpunit/phpunit": "~4.4",
         "squizlabs/php_codesniffer": "~2.0",
         "ongr/ongr-strict-standard": "~2.0"
     },
     "autoload": {
         "psr-4": {
-            "ONGR\\ElasticsearchDSL\\": "src/",
+            "ONGR\\ElasticsearchDSL\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
             "ONGR\\ElasticsearchDSL\\Tests\\": "tests/"
         }
     }
diff --git a/src/DslTypeAwareTrait.php b/src/DslTypeAwareTrait.php
index 122144e12938a58f0a354f1d1de911a90d72aa99..2bfc282379d2118ad0cbeca22bee86ddd75e2969 100644
--- a/src/DslTypeAwareTrait.php
+++ b/src/DslTypeAwareTrait.php
@@ -11,8 +11,6 @@
 
 namespace ONGR\ElasticsearchDSL;
 
-use Elasticsearch\Common\Exceptions\InvalidArgumentException;
-
 /**
  * A trait which handles dsl type.
  */
@@ -38,12 +36,12 @@ trait DslTypeAwareTrait
      *
      * @param string $dslType
      *
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      */
     public function setDslType($dslType)
     {
         if ($dslType !== 'filter' && $dslType !== 'query') {
-            throw new InvalidArgumentException('Not supported dsl type');
+            throw new \InvalidArgumentException('Not supported dsl type');
         }
         $this->dslType = $dslType;
     }