diff --git a/composer.json b/composer.json
index 7b904f3..574ee7f 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,7 @@
   "keywords": ["nette", "upload", "file upload"],
   "homepage": "http://ondraplsek.cz",
   "license": ["MIT"],
+  "version": "7.1.0",
   "authors": [
     {
       "name": "Ondřej Plšek",
@@ -15,11 +16,11 @@
   "require": {
     "php": ">=5.6.0",
     "ext-gd": "*",
-    "nette/bootstrap": "~2.3.0|~2.4.0",
-    "nette/di": "~2.3.0|~2.4.0",
-    "nette/finder": "~2.3.0|~2.4.0",
-    "nette/http": "~2.3.0|~2.4.0",
-    "nette/utils":"~2.4.0|~2.5.0",
+    "nette/bootstrap": "~2.3.0|~2.4.0|^3.0.0",
+    "nette/di": "~2.3.0|~2.4.0|^3.0.0",
+    "nette/finder": "~2.3.0|~2.4.0|~2.5.0",
+    "nette/http": "~2.3.0|~2.4.0|^3.0.0",
+    "nette/utils":"~2.4.0|~2.5.0|^3.0.0",
     "guzzlehttp/guzzle":"~6.3.0",
     "aws/aws-sdk-php": "~3.19"
   },
diff --git a/src/ondrs/UploadManager/DI/Extension.php b/src/ondrs/UploadManager/DI/Extension.php
index d755b0a..747abde 100644
--- a/src/ondrs/UploadManager/DI/Extension.php
+++ b/src/ondrs/UploadManager/DI/Extension.php
@@ -38,7 +38,7 @@ class Extension extends CompilerExtension
 
     public function loadConfiguration()
     {
-        $config = $this->getConfig($this->defaults);
+        $config = $this->getConfig() + $this->defaults;
         $builder = $this->getContainerBuilder();
 
         if ($config['relativePath'] === NULL) {
@@ -47,12 +47,12 @@ public function loadConfiguration()
 
         if (isset($config['s3'])) {
             $builder->addDefinition($this->prefix('s3Client'))
-                ->setClass(S3Client::class, [
+                ->setFactory(S3Client::class, [
                     $config['s3'],
                 ]);
 
             $builder->addDefinition($this->prefix('storage'))
-                ->setClass(S3Storage::class, [
+                ->setFactory(S3Storage::class, [
                     $config['basePath'],
                     $config['relativePath'],
                     $builder->getDefinition($this->prefix('s3Client')),
@@ -60,7 +60,7 @@ public function loadConfiguration()
 
         } else {
             $builder->addDefinition($this->prefix('storage'))
-                ->setClass(FileStorage::class, [
+                ->setFactory(FileStorage::class, [
                     $config['basePath'],
                     $config['relativePath'],
                 ]);
@@ -74,12 +74,12 @@ public function loadConfiguration()
             ->setClass(ManagerContainer::class);
 
         $builder->addDefinition($this->prefix('imageProcessor'))
-            ->setClass(ImageProcessor::class, [
+            ->setFactory(ImageProcessor::class, [
                 $config['tempDir'],
             ]);
 
         $builder->addDefinition($this->prefix('imageManager'))
-            ->setClass(ImageManager::class, [
+            ->setFactory(ImageManager::class, [
                 $builder->getDefinition($this->prefix('storage')),
                 $builder->getDefinition($this->prefix('imageProcessor')),
                 $config['tempDir'],
@@ -95,7 +95,7 @@ public function loadConfiguration()
         }
 
         $builder->addDefinition($this->prefix('fileManager'))
-            ->setClass(FileManager::class, [
+            ->setFactory(FileManager::class, [
                 $builder->getDefinition($this->prefix('storage')),
                 $config['fileManager']['blacklist'],
             ]);