diff --git a/DependencyInjection/Factory/AmazonS3AdapterFactory.php b/DependencyInjection/Factory/AmazonS3AdapterFactory.php
index f583d7b..b6d6467 100644
--- a/DependencyInjection/Factory/AmazonS3AdapterFactory.php
+++ b/DependencyInjection/Factory/AmazonS3AdapterFactory.php
@@ -18,12 +18,14 @@ class AmazonS3AdapterFactory implements AdapterFactoryInterface
     */
     public function create(ContainerBuilder $container, $id, array $config)
     {
-        $container
+        $definition = $container
             ->setDefinition($id, new DefinitionDecorator('knp_gaufrette.adapter.amazon_s3'))
             ->addArgument(new Reference($config['amazon_s3_id']))
-            ->addArgument($config['bucket_name'])
-            ->addArgument($config['create'])
-        ;
+            ->addArgument($config['bucket_name']);
+
+        if (isset($config['options'])) {
+            $definition->addArgument($config['options']);
+        }
     }
 
     /**
@@ -47,8 +49,16 @@ class AmazonS3AdapterFactory implements AdapterFactoryInterface
             ->children()
                 ->scalarNode('amazon_s3_id')->isRequired()->cannotBeEmpty()->end()
                 ->scalarNode('bucket_name')->isRequired()->cannotBeEmpty()->end()
-                ->booleanNode('create')->defaultFalse()->end()
+                ->arrayNode('options')
+                    ->children()
+                        ->booleanNode('create')
+                            ->defaultFalse()
+                        ->end()
+                        ->scalarNode('region')->end()
+                        ->scalarNode('directory')->end()
+                    ->end()
+                ->end()
             ->end()
         ;
     }
-}
\ No newline at end of file
+}
diff --git a/composer.json b/composer.json
index cfce48c..3ffece0 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     ],
     "require":      {
         "symfony/framework-bundle": "2.*",
-        "knplabs/gaufrette":        "0.1.3"
+        "knplabs/gaufrette":        "*"
     },
     "require-dev": {
         "symfony/yaml": "2.*",
@@ -28,5 +28,10 @@
             "Knp\\Bundle\\GaufretteBundle": ""
         }
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "0.2.x-dev"
+        }
+    },
     "target-dir":   "Knp/Bundle/GaufretteBundle"
 }