diff --git a/example-2.0/server/providers-private.json b/example-2.0/server/providers-private.json
index 77cc7c9..1f715a6 100644
--- a/example-2.0/server/providers-private.json
+++ b/example-2.0/server/providers-private.json
@@ -1,11 +1,30 @@
 {
-  "rackspace": {
+  "storage-rackspace": {
+    "name": "storage",
+    "connector": "loopback-component-storage",
     "username": "strongloop",
     "apiKey": "a51076644fc37583bd87dd648b58777e",
     "region": "DFW"
   },
-  "amazon": {
+  "storage-amazon": {
+    "name": "storage",
+    "connector": "loopback-component-storage",
     "keyId": "AKIAJXSYYW7EAWTJYMLA",
     "key": "TkW/9i7nNsOEg/vvYS4P/zexNrzDvkjQp3NwF7J7"
+  },
+  "storage-filesystem": {
+    "name": "storage",
+    "connector": "loopback-component-storage",
+    "provider": "filesystem",
+    "root": "./server/storage"
+  },
+  "storage-azure": {
+      "name": "storage",
+      "connector": "loopback-component-storage",
+      "provider": "azure",
+      "protocol": "http",
+      "serversUrl": "blob.core.windows.net",
+      "storageAccount": "yourAzureAccount",
+      "storageAccessKey": "yourAzureKey"
   }
 }
diff --git a/lib/providers/filesystem/index.js b/lib/providers/filesystem/index.js
index 9285103..5cadfec 100644
--- a/lib/providers/filesystem/index.js
+++ b/lib/providers/filesystem/index.js
@@ -199,6 +199,7 @@ FileSystemProvider.prototype.getFiles = function (container, options, cb) {
   if (!validateName(container, cb)) return;
   var dir = path.join(this.root, container);
   fs.readdir(dir, function (err, entries) {
+    entries = entries || [];
     var files = [];
     var tasks = [];
     entries.forEach(function (f) {
diff --git a/lib/storage-service.js b/lib/storage-service.js
index 0f1ee66..3f4b755 100644
--- a/lib/storage-service.js
+++ b/lib/storage-service.js
@@ -155,6 +155,11 @@ StorageService.prototype.downloadStream = function (container, file, options, cb
  * @param {Object[]} files An array of file metadata objects
  */
 StorageService.prototype.getFiles = function (container, options, cb) {
+  if(typeof options === 'function' && !cb) {
+    // options argument is not present
+    cb = options;
+    options = {};
+  }
   return this.client.getFiles(container, options, function (err, files) {
     if (err) {
       cb(err, files);