diff --git a/lib/index.js b/lib/index.js
index c282325..d19e0cc 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1 +1,17 @@
-module.exports = Object.assign({}, require('./filesystem-manager'), require('./filesystem-fs'), require('./filesystem-s3'));
+var FsClient, GoogleStorageClient, Manager, ReadResult, S3Bucket, ref;
+
+ref = require('./filesystem-manager'), Manager = ref.Manager, ReadResult = ref.ReadResult;
+
+FsClient = require('./filesystem-fs').FsClient;
+
+S3Bucket = require('./filesystem-s3').S3Bucket;
+
+GoogleStorageClient = require('./filesystem-google-storage').GoogleStorageClient;
+
+module.exports = {
+  Manager: Manager,
+  ReadResult: ReadResult,
+  FsClient: FsClient,
+  S3Bucket: S3Bucket,
+  GoogleStorageClient: GoogleStorageClient
+};
diff --git a/package.json b/package.json
index 0f34110..55e173d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jaune-fs",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "file system for jaune framework",
   "main": "index.js",
   "scripts": {
@@ -11,7 +11,8 @@
   "author": "Alvaro Juste <juste.alvaro@gmail.com>",
   "license": "ISC",
   "dependencies": {
-    "jaune-env": "0.0.5",
+    "jaune-env": "~0.0.5",
+    "jaune-util": "0.0.6",
     "mime": "^1.3.4",
     "ncp": "^2.0.0",
     "path": "^0.12.7"
diff --git a/src/index.coffee b/src/index.coffee
index 1b64b70..bd151fc 100644
--- a/src/index.coffee
+++ b/src/index.coffee
@@ -1,6 +1,15 @@
-module.exports = Object.assign(
-  {}
-  require './filesystem-manager'
-  require './filesystem-fs'
-  require './filesystem-s3'
-)
+{
+  Manager
+  ReadResult
+} = require './filesystem-manager'
+{
+  FsClient
+} = require './filesystem-fs'
+{
+  S3Bucket
+} = require './filesystem-s3'
+{
+  GoogleStorageClient
+} = require './filesystem-google-storage'
+
+module.exports = {Manager, ReadResult, FsClient, S3Bucket, GoogleStorageClient}
diff --git a/test/lib/index.coffee b/test/lib/index.coffee
new file mode 100644
index 0000000..02c1a61
--- /dev/null
+++ b/test/lib/index.coffee
@@ -0,0 +1,20 @@
+{
+  equal,
+  ok
+} = require 'assert'
+
+lib = require '../../'
+
+describe 'lib/index', ->
+
+  it 'exports expected properties', ->
+    ok lib
+    ok lib.FsClient
+    ok lib.GoogleStorageClient
+    ok lib.S3Bucket
+    ok lib.Manager
+    ok lib.ReadResult
+
+  it 'contains no more properties than expected', ->
+
+    equal 5, Object.getOwnPropertyNames(lib).length