diff --git a/Gruntfile.js b/Gruntfile.js
index 2418daa..8dfe98a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -30,7 +30,7 @@ module.exports = function(grunt) {
                 }
             },
             vanilla: {
-                src: ['lib/http_adapter/vanilla.js', 'lib/index.js', 'lib/vanilla.js'],
+                src: ['lib/http_adapter/vanilla.js', 'lib/index.js'],
                 dest: 'api-client.js'
             }
         },
diff --git a/README.md b/README.md
index eac97c3..3e7a597 100644
--- a/README.md
+++ b/README.md
@@ -51,15 +51,23 @@ app.get('/', function(req, res) {
 });
 ```
 
-**browser**
+**Browser (no package manager)**
 
 ```js
-<script src="bower_components/tagged-api/tagged-api-min.js"></script>
-<script>
+var adapter =  new TaggedApiVanillaAdapter(XMLHttpRequest, Promise);
 var api = new TaggedApi('/api.php', {
     session_id: 'abc123' // Session cookie ID from `document.cookie`
-});
-</script>
+}, adapter);
+```
+
+**Browser (CommonJS)**
+
+```js
+import {Client, VanillaAdapter} from 'bower_components/tagged-api/tagged-api-min.js';
+var adapter =  new VanillaAdapter(XMLHttpRequest, Promise);
+var api = new Client('/api.php', {
+    session_id: 'abc123' // Session cookie ID from `document.cookie`
+}, adapter);
 ```
 
 Executing API Calls
diff --git a/api-angular-min.js b/api-angular-min.js
index 6b06b61..d364d37 100644
--- a/api-angular-min.js
+++ b/api-angular-min.js
@@ -1 +1 @@
-!function(){"use strict";function a(b,c){for(var d in c)if(c.hasOwnProperty(d))try{c[d].constructor===Object?b[d]=a(b[d],c[d]):b[d]=c[d]}catch(e){b[d]=c[d]}return b}var b="undefined"!=typeof exports?exports:window,c=b.btoa||require("btoa");if("function"==typeof require)var d=b.Promise||require("bluebird");var e=/; */,f=function(c,d,f){if(this._endpoint=c,this._http="undefined"!=typeof f?f:new VanillaAdapter(b.XMLHttpRequest,b.Promise||require("bluebird")),this._queue=[],this._maxQueueSize=null,this._batchTimeout=null,this._options=a({query:{},params:{track:this._generateTrackId()},timeout:1e4},d||{}),this._cookies={},d.cookies){var g=d.cookies.split(e);g.forEach(function(a){var b=a.split("=",2);this._cookies[b[0]]=b[1]}.bind(this))}var h=parseInt(this._options.timeout,10)||1e4;h<0&&(h=1e4),this._http.setTimeout(h),this._events={},this._cache={}};f.prototype._generateTrackId=function(){return c(1e8*Math.random()).substr(0,10)},f.prototype.setMaxQueueSize=function(a){this._maxQueueSize=a},f.prototype.getMaxQueueSize=function(a){return this._maxQueueSize},f.prototype.execute=function(b,c,e){if(!b||"string"!=typeof b)throw new Error("Method is required to execute API calls");var f=Math.random();if(f>.99){var g=(new Date).getTime();for(var h in this._cache)this._cache[h].expires<g&&delete this._cache[h]}var i;if(e&&e.cache&&(i=b+":"+JSON.stringify(c),this._cache.hasOwnProperty(i))){var j=this._cache[i],g=(new Date).getTime();if(j.expires>g)return this._cache[i];delete this._cache[i]}var k=new d(function(d,e){var f=a({},this._options.params);this._queue.push({method:b,params:a(f,c||{}),deferred:{resolve:d,reject:e},timeStart:l()}),this._maxQueueSize&&this._queue.length>=this._maxQueueSize?this._postToApi():null===this._batchTimeout&&(this._batchTimeout=setTimeout(this._postToApi.bind(this),1))}.bind(this));if(i){var g=(new Date).getTime(),m=e.cache===!0?1/0:g+1e3*e.cache;this._cache[i]={expires:m,promise:k}}return k},f.prototype._postToApi=function(){var a=j(this._queue),b={};for(var c in this._options.query)b[c]=this._options.query[c];var d=[];for(var e in b)b.hasOwnProperty(e)&&d.push(e+"="+b[e]);var f=d.join("&");this._http.post({body:a,url:this._endpoint+"?"+f,cookies:this._options.cookies,clientId:this._options.clientId,secret:this._options.secret,headers:this._options.headers||{},timeStart:this._queueTimeStart}).then(g).then(h.bind(this,this._queue))["catch"](i.bind(this,this._queue)),this.resetQueue()};var g=function(a){var b=[],c=JSON.parse(a.body);for(var d in c)b.push(JSON.parse(c[d]));return b},h=function(a,b){for(var c in a){var d=b[c];if(null==d&&(d={result:null,stat:"ok"}),d.stat&&this._events.hasOwnProperty(d.stat))for(var e in this._events[d.stat])this._events[d.stat][e](a[c],d);d.stat&&"ok"!==d.stat?a[c].deferred.reject(d):a[c].deferred.resolve(d)}return b},i=function(a,b){for(var c in a)a[c].deferred.reject(b);return b};f.prototype.resetQueue=function(){null!==this._batchTimeout&&(clearTimeout(this._batchTimeout),this._batchTimeout=null),this._queue=[]},f.prototype.on=function(a,b){this._events.hasOwnProperty(a)||(this._events[a]=[]),this._events[a].push(b)},f.middleware=function(b,c){var d=require("./http_adapter/node"),e=new d;return function(d,g,h){var i={query:{application_id:"user",format:"JSON"},params:{api_signature:""},cookies:d.headers&&d.headers.cookie,headers:{}};if(c&&c.passHeaders)for(var j=0,k=c.passHeaders.length;j<k;j++){var l=c.passHeaders[j];d.headers.hasOwnProperty(l)&&(i.headers[l]=d.headers[l])}d.api=new f(b,a(i,c||{}),e),h()}};var j=function(a){var b=[];for(var c in a){var d=k(a[c]);b.push(d)}return"\n"+b.join("\n")+"\n"},k=function(a){var b=["method="+encodeURIComponent(a.method)];for(var c in a.params)null!==a.params[c]&&a.params.hasOwnProperty(c)&&b.push(m(c,a.params[c]));return b.join("&")},l=function(){if(process&&"function"==typeof process.hrtime)return process.hrtime();if(window&&window.performance&&"function"==typeof window.performance.now){var a=window.performance.now().toString();if(a.match(/^[0-9]+\.[0-9]+$/))return a.split(".").map(function(a){return parseInt(a)})}return[(new Date).getTime(),0]},m=function(a,b){var c=typeof b;switch(c){case"string":case"number":case"boolean":return n(a,b);case"undefined":return n(a,"");case"object":return null===b?n(a,b):o(a,b);default:throw new Error("Unable to parameterize key "+a+" with type "+c)}},n=function(a,b){return encodeURIComponent(a)+"="+encodeURIComponent(b)},o=function(a,b){var c=[];if(Array.isArray(b))for(var d=0,e=b.length;d<e;d++)c.push(encodeURIComponent(a)+"[]="+encodeURIComponent(b[d]));else for(var f in b)b.hasOwnProperty(f)&&c.push(encodeURIComponent(a)+"["+encodeURIComponent(f)+"]="+encodeURIComponent(b[f]));return c.join("&")};"undefined"!=typeof exports?module.exports=f:b.TaggedApi=f}(),function(){"use strict";function a(a,b){this._$http=a,this._$window=b,this._timeout=1e4}var b="undefined"!=typeof exports?exports:window;a.$inject=["$http","$window"],a.prototype.setTimeout=function(a){this._timeout=parseInt(a,10)||1e4},a.prototype.post=function(a){var b={"x-tagged-client-id":a.clientId,"x-tagged-client-url":this._$window.location.href,"Content-Type":"application/x-www-form-urlencoded; charset=UTF-8","X-Requested-With":"XMLHttpRequest"};return this._$http.post(a.url,a.body,{timeout:this._timeout,transformResponse:c,headers:b}).then(d)};var c=function(a){return a},d=function(a){return{body:a.data}};if("undefined"!=typeof exports)module.exports=a;else{var e=b.TaggedApi||{};e.AngularAdapter=a}}(),function(){"use strict";var a=function(a,b){function c(a,c,d){var e=new b.AngularAdapter(a,d),f=new b("/api/",{query:{application_id:"user",format:"json"},clientId:this.clientId,timeout:this.timeout},e);return f.execute=function(a,d){return c.when(b.prototype.execute.call(this,a,d))},f}var d=a.module("tagged.service.api",[]);d.factory("taggedApi",c),c.$inject=["$http","$q","$window"],c.timeout=1e4};"undefined"!=typeof exports?module.exports=a:TaggedApi.angularWrapper=a}(),TaggedApi.angularWrapper(angular,TaggedApi);
\ No newline at end of file
+!function(){"use strict";function a(b,c){for(var d in c)if(c.hasOwnProperty(d))try{c[d].constructor===Object?b[d]=a(b[d],c[d]):b[d]=c[d]}catch(e){b[d]=c[d]}return b}var b="undefined"!=typeof exports?exports:window,c=b.btoa||require("btoa");if("function"==typeof require)var d=b.Promise||require("bluebird");var e=/; */,f=function(b,c,d){if(this._endpoint=b,this._http=d,this._queue=[],this._maxQueueSize=null,this._batchTimeout=null,this._options=a({query:{},params:{track:this._generateTrackId()},timeout:1e4},c||{}),this._cookies={},c.cookies){var f=c.cookies.split(e);f.forEach(function(a){var b=a.split("=",2);this._cookies[b[0]]=b[1]}.bind(this))}var g=parseInt(this._options.timeout,10)||1e4;g<0&&(g=1e4),this._http.setTimeout(g),this._events={},this._cache={}};f.prototype._generateTrackId=function(){return c(1e8*Math.random()).substr(0,10)},f.prototype.setMaxQueueSize=function(a){this._maxQueueSize=a},f.prototype.getMaxQueueSize=function(a){return this._maxQueueSize},f.prototype.execute=function(b,c,e){if(!b||"string"!=typeof b)throw new Error("Method is required to execute API calls");var f=Math.random();if(f>.99){var g=(new Date).getTime();for(var h in this._cache)this._cache[h].expires<g&&delete this._cache[h]}var i;if(e&&e.cache&&(i=b+":"+JSON.stringify(c),this._cache.hasOwnProperty(i))){var j=this._cache[i],g=(new Date).getTime();if(j.expires>g)return this._cache[i];delete this._cache[i]}var k=new d(function(d,e){var f=a({},this._options.params);this._queue.push({method:b,params:a(f,c||{}),deferred:{resolve:d,reject:e},timeStart:m()}),this._maxQueueSize&&this._queue.length>=this._maxQueueSize?this._postToApi():null===this._batchTimeout&&(this._batchTimeout=setTimeout(this._postToApi.bind(this),1))}.bind(this));if(i){var g=(new Date).getTime(),l=e.cache===!0?1/0:g+1e3*e.cache;this._cache[i]={expires:l,promise:k}}return k},f.prototype._postToApi=function(){var a=k(this._queue),b={};for(var c in this._options.query)b[c]=this._options.query[c];var d=[];for(var e in b)b.hasOwnProperty(e)&&d.push(e+"="+b[e]);var f=d.join("&");this._http.post({body:a,url:this._endpoint+"?"+f,cookies:this._options.cookies,clientId:this._options.clientId,secret:this._options.secret,headers:this._options.headers||{},timeStart:this._queueTimeStart}).then(g).then(h.bind(this,this._queue))["catch"](i.bind(this,this._queue)),this.resetQueue()};var g=function(a){var b=[],c=JSON.parse(a.body);for(var d in c)b.push(JSON.parse(c[d]));return b},h=function(a,b){for(var c in a){var d=b[c];if(null==d&&(d={result:null,stat:"ok"}),d.stat&&this._events.hasOwnProperty(d.stat))for(var e in this._events[d.stat])this._events[d.stat][e](a[c],d);d.stat&&"ok"!==d.stat?a[c].deferred.reject(d):a[c].deferred.resolve(d)}return b},i=function(a,b){for(var c in a)a[c].deferred.reject(b);return b};f.prototype.resetQueue=function(){null!==this._batchTimeout&&(clearTimeout(this._batchTimeout),this._batchTimeout=null),this._queue=[]},f.prototype.on=function(a,b){this._events.hasOwnProperty(a)||(this._events[a]=[]),this._events[a].push(b)};var j=function(b,c){var d=require("./http_adapter/node"),e=new d;return function(d,g,h){var i={query:{application_id:"user",format:"JSON"},params:{api_signature:""},cookies:d.headers&&d.headers.cookie,headers:{}};if(c&&c.passHeaders)for(var j=0,k=c.passHeaders.length;j<k;j++){var l=c.passHeaders[j];d.headers.hasOwnProperty(l)&&(i.headers[l]=d.headers[l])}d.api=new f(b,a(i,c||{}),e),h()}},k=function(a){var b=[];for(var c in a){var d=l(a[c]);b.push(d)}return"\n"+b.join("\n")+"\n"},l=function(a){var b=["method="+encodeURIComponent(a.method)];for(var c in a.params)null!==a.params[c]&&a.params.hasOwnProperty(c)&&b.push(n(c,a.params[c]));return b.join("&")},m=function(){if(process&&"function"==typeof process.hrtime)return process.hrtime();if(window&&window.performance&&"function"==typeof window.performance.now){var a=window.performance.now().toString();if(a.match(/^[0-9]+\.[0-9]+$/))return a.split(".").map(function(a){return parseInt(a)})}return[(new Date).getTime(),0]},n=function(a,b){var c=typeof b;switch(c){case"string":case"number":case"boolean":return o(a,b);case"undefined":return o(a,"");case"object":return null===b?o(a,b):p(a,b);default:throw new Error("Unable to parameterize key "+a+" with type "+c)}},o=function(a,b){return encodeURIComponent(a)+"="+encodeURIComponent(b)},p=function(a,b){var c=[];if(Array.isArray(b))for(var d=0,e=b.length;d<e;d++)c.push(encodeURIComponent(a)+"[]="+encodeURIComponent(b[d]));else for(var f in b)b.hasOwnProperty(f)&&c.push(encodeURIComponent(a)+"["+encodeURIComponent(f)+"]="+encodeURIComponent(b[f]));return c.join("&")};"undefined"!=typeof module&&module.exports?(module.exports.Client=f,module.exports.middleware=j):b.TaggedApi=f}(),function(){"use strict";function a(a,b){this._$http=a,this._$window=b,this._timeout=1e4}var b="undefined"!=typeof exports?exports:window;a.$inject=["$http","$window"],a.prototype.setTimeout=function(a){this._timeout=parseInt(a,10)||1e4},a.prototype.post=function(a){var b={"x-tagged-client-id":a.clientId,"x-tagged-client-url":this._$window.location.href,"Content-Type":"application/x-www-form-urlencoded; charset=UTF-8","X-Requested-With":"XMLHttpRequest"};return this._$http.post(a.url,a.body,{timeout:this._timeout,transformResponse:c,headers:b}).then(d)};var c=function(a){return a},d=function(a){return{body:a.data}};if("undefined"!=typeof exports)module.exports=a;else{var e=b.TaggedApi||{};e.AngularAdapter=a}}(),function(){"use strict";var a=function(a,b){function c(a,c,d){var e=new b.AngularAdapter(a,d),f=new b("/api/",{query:{application_id:"user",format:"json"},clientId:this.clientId,timeout:this.timeout},e);return f.execute=function(a,d){return c.when(b.prototype.execute.call(this,a,d))},f}var d=a.module("tagged.service.api",[]);d.factory("taggedApi",c),c.$inject=["$http","$q","$window"],c.timeout=1e4};"undefined"!=typeof exports?module.exports=a:TaggedApi.angularWrapper=a}(),TaggedApi.angularWrapper(angular,TaggedApi);
\ No newline at end of file
diff --git a/api-angular.js b/api-angular.js
index b0c1e69..2deb7c2 100644
--- a/api-angular.js
+++ b/api-angular.js
@@ -24,8 +24,8 @@
     var TaggedApi = function(endpoint, options, http) {
         this._endpoint = endpoint;
 
-        // Default to the vanilla adapter should clients not pass adapter
-        this._http = (typeof http !== 'undefined') ? http : new VanillaAdapter(context.XMLHttpRequest, context.Promise || require('bluebird'));
+        // HTTP adapter to perform HTTP requests
+        this._http = http;
 
         // API calls that are made within a single JS execution frame will be added
         // to the queue and processed as a whole on the next tick.
@@ -259,7 +259,7 @@
         this._events[stat].push(callback);
     };
 
-    TaggedApi.middleware = function(url, options) {
+    var middleware = function(url, options) {
         var NodeAdapter = require('./http_adapter/node');
         var http = new NodeAdapter();
 
@@ -420,11 +420,12 @@
         return obj1;
     }
 
-    if (typeof exports !== 'undefined') {
-        // We're in a nodejs environment, export this module
-        module.exports = TaggedApi;
+    if (typeof module !== 'undefined' && module.exports) {
+        // We're in a commonjs environment
+        module.exports.Client = TaggedApi;
+        module.exports.middleware = middleware;
     } else {
-        // We're in a browser environment, expose this module globally
+        // All other environments, expose TaggedApi globally
         context.TaggedApi = TaggedApi;
     }
 })();
diff --git a/api-client-min.js b/api-client-min.js
index 2fc3aba..70c4355 100644
--- a/api-client-min.js
+++ b/api-client-min.js
@@ -1 +1 @@
-var VanillaAdapter=function(a,b){this._xmlhttprequest=a,this._headers={"X-Requested-With":"XMLHttpRequest","Content-Type":"application/x-www-form-urlencoded; charset=UTF-8"},this._promise=b,this._timeout=1e4};VanillaAdapter.prototype.setTimeout=function(a){this._timeout=parseInt(a,10)||a},VanillaAdapter.prototype.setHeader=function(a,b){this._headers[a]=b},VanillaAdapter.prototype.setHeaders=function(a){for(var b in a)a.hasOwnProperty(b)&&this.setHeader(b,a[b])},VanillaAdapter.prototype.post=function(a){return new this._promise(function(b,c){var d=new this._xmlhttprequest;d.open("POST",a.url,!0),Object.keys(this._headers).forEach(function(a){d.setRequestHeader(a,this._headers[a])}.bind(this)),d.timeout=this._timeout,d.onreadystatechange=function(){if(4===d.readyState){try{var a=JSON.parse(d.responseText)}catch(e){c(e)}b(a)}},d.send(a.body)}.bind(this))},module.exports=VanillaAdapter,function(){"use strict";function a(b,c){for(var d in c)if(c.hasOwnProperty(d))try{c[d].constructor===Object?b[d]=a(b[d],c[d]):b[d]=c[d]}catch(e){b[d]=c[d]}return b}var b="undefined"!=typeof exports?exports:window,c=b.btoa||require("btoa");if("function"==typeof require)var d=b.Promise||require("bluebird");var e=/; */,f=function(c,d,f){if(this._endpoint=c,this._http="undefined"!=typeof f?f:new VanillaAdapter(b.XMLHttpRequest,b.Promise||require("bluebird")),this._queue=[],this._maxQueueSize=null,this._batchTimeout=null,this._options=a({query:{},params:{track:this._generateTrackId()},timeout:1e4},d||{}),this._cookies={},d.cookies){var g=d.cookies.split(e);g.forEach(function(a){var b=a.split("=",2);this._cookies[b[0]]=b[1]}.bind(this))}var h=parseInt(this._options.timeout,10)||1e4;h<0&&(h=1e4),this._http.setTimeout(h),this._events={},this._cache={}};f.prototype._generateTrackId=function(){return c(1e8*Math.random()).substr(0,10)},f.prototype.setMaxQueueSize=function(a){this._maxQueueSize=a},f.prototype.getMaxQueueSize=function(a){return this._maxQueueSize},f.prototype.execute=function(b,c,e){if(!b||"string"!=typeof b)throw new Error("Method is required to execute API calls");var f=Math.random();if(f>.99){var g=(new Date).getTime();for(var h in this._cache)this._cache[h].expires<g&&delete this._cache[h]}var i;if(e&&e.cache&&(i=b+":"+JSON.stringify(c),this._cache.hasOwnProperty(i))){var j=this._cache[i],g=(new Date).getTime();if(j.expires>g)return this._cache[i];delete this._cache[i]}var k=new d(function(d,e){var f=a({},this._options.params);this._queue.push({method:b,params:a(f,c||{}),deferred:{resolve:d,reject:e},timeStart:l()}),this._maxQueueSize&&this._queue.length>=this._maxQueueSize?this._postToApi():null===this._batchTimeout&&(this._batchTimeout=setTimeout(this._postToApi.bind(this),1))}.bind(this));if(i){var g=(new Date).getTime(),m=e.cache===!0?1/0:g+1e3*e.cache;this._cache[i]={expires:m,promise:k}}return k},f.prototype._postToApi=function(){var a=j(this._queue),b={};for(var c in this._options.query)b[c]=this._options.query[c];var d=[];for(var e in b)b.hasOwnProperty(e)&&d.push(e+"="+b[e]);var f=d.join("&");this._http.post({body:a,url:this._endpoint+"?"+f,cookies:this._options.cookies,clientId:this._options.clientId,secret:this._options.secret,headers:this._options.headers||{},timeStart:this._queueTimeStart}).then(g).then(h.bind(this,this._queue))["catch"](i.bind(this,this._queue)),this.resetQueue()};var g=function(a){var b=[],c=JSON.parse(a.body);for(var d in c)b.push(JSON.parse(c[d]));return b},h=function(a,b){for(var c in a){var d=b[c];if(null==d&&(d={result:null,stat:"ok"}),d.stat&&this._events.hasOwnProperty(d.stat))for(var e in this._events[d.stat])this._events[d.stat][e](a[c],d);d.stat&&"ok"!==d.stat?a[c].deferred.reject(d):a[c].deferred.resolve(d)}return b},i=function(a,b){for(var c in a)a[c].deferred.reject(b);return b};f.prototype.resetQueue=function(){null!==this._batchTimeout&&(clearTimeout(this._batchTimeout),this._batchTimeout=null),this._queue=[]},f.prototype.on=function(a,b){this._events.hasOwnProperty(a)||(this._events[a]=[]),this._events[a].push(b)},f.middleware=function(b,c){var d=require("./http_adapter/node"),e=new d;return function(d,g,h){var i={query:{application_id:"user",format:"JSON"},params:{api_signature:""},cookies:d.headers&&d.headers.cookie,headers:{}};if(c&&c.passHeaders)for(var j=0,k=c.passHeaders.length;j<k;j++){var l=c.passHeaders[j];d.headers.hasOwnProperty(l)&&(i.headers[l]=d.headers[l])}d.api=new f(b,a(i,c||{}),e),h()}};var j=function(a){var b=[];for(var c in a){var d=k(a[c]);b.push(d)}return"\n"+b.join("\n")+"\n"},k=function(a){var b=["method="+encodeURIComponent(a.method)];for(var c in a.params)null!==a.params[c]&&a.params.hasOwnProperty(c)&&b.push(m(c,a.params[c]));return b.join("&")},l=function(){if(process&&"function"==typeof process.hrtime)return process.hrtime();if(window&&window.performance&&"function"==typeof window.performance.now){var a=window.performance.now().toString();if(a.match(/^[0-9]+\.[0-9]+$/))return a.split(".").map(function(a){return parseInt(a)})}return[(new Date).getTime(),0]},m=function(a,b){var c=typeof b;switch(c){case"string":case"number":case"boolean":return n(a,b);case"undefined":return n(a,"");case"object":return null===b?n(a,b):o(a,b);default:throw new Error("Unable to parameterize key "+a+" with type "+c)}},n=function(a,b){return encodeURIComponent(a)+"="+encodeURIComponent(b)},o=function(a,b){var c=[];if(Array.isArray(b))for(var d=0,e=b.length;d<e;d++)c.push(encodeURIComponent(a)+"[]="+encodeURIComponent(b[d]));else for(var f in b)b.hasOwnProperty(f)&&c.push(encodeURIComponent(a)+"["+encodeURIComponent(f)+"]="+encodeURIComponent(b[f]));return c.join("&")};"undefined"!=typeof exports?module.exports=f:b.TaggedApi=f}(),function(a){a.TaggedApi=TaggedApi}(window);
\ No newline at end of file
+!function(){var a="undefined"!=typeof exports?exports:window,b=function(a,b){this._xmlhttprequest=a,this._headers={"X-Requested-With":"XMLHttpRequest","Content-Type":"application/x-www-form-urlencoded; charset=UTF-8"},this._promise=b,this._timeout=1e4};b.prototype.setTimeout=function(a){this._timeout=parseInt(a,10)||a},b.prototype.setHeader=function(a,b){this._headers[a]=b},b.prototype.setHeaders=function(a){for(var b in a)a.hasOwnProperty(b)&&this.setHeader(b,a[b])},b.prototype.post=function(a){return new this._promise(function(b,c){var d=new this._xmlhttprequest;d.open("POST",a.url,!0),Object.keys(this._headers).forEach(function(a){d.setRequestHeader(a,this._headers[a])}.bind(this)),d.timeout=this._timeout,d.onreadystatechange=function(){if(4===d.readyState){try{var a=JSON.parse(d.responseText)}catch(e){c(e)}b(a)}},d.send(a.body)}.bind(this))},"undefined"!=typeof module&&module.exports?module.exports.VanillaAdapter=b:a.TaggedApiVanillaAdapter=b}(this),function(){"use strict";function a(b,c){for(var d in c)if(c.hasOwnProperty(d))try{c[d].constructor===Object?b[d]=a(b[d],c[d]):b[d]=c[d]}catch(e){b[d]=c[d]}return b}var b="undefined"!=typeof exports?exports:window,c=b.btoa||require("btoa");if("function"==typeof require)var d=b.Promise||require("bluebird");var e=/; */,f=function(b,c,d){if(this._endpoint=b,this._http=d,this._queue=[],this._maxQueueSize=null,this._batchTimeout=null,this._options=a({query:{},params:{track:this._generateTrackId()},timeout:1e4},c||{}),this._cookies={},c.cookies){var f=c.cookies.split(e);f.forEach(function(a){var b=a.split("=",2);this._cookies[b[0]]=b[1]}.bind(this))}var g=parseInt(this._options.timeout,10)||1e4;g<0&&(g=1e4),this._http.setTimeout(g),this._events={},this._cache={}};f.prototype._generateTrackId=function(){return c(1e8*Math.random()).substr(0,10)},f.prototype.setMaxQueueSize=function(a){this._maxQueueSize=a},f.prototype.getMaxQueueSize=function(a){return this._maxQueueSize},f.prototype.execute=function(b,c,e){if(!b||"string"!=typeof b)throw new Error("Method is required to execute API calls");var f=Math.random();if(f>.99){var g=(new Date).getTime();for(var h in this._cache)this._cache[h].expires<g&&delete this._cache[h]}var i;if(e&&e.cache&&(i=b+":"+JSON.stringify(c),this._cache.hasOwnProperty(i))){var j=this._cache[i],g=(new Date).getTime();if(j.expires>g)return this._cache[i];delete this._cache[i]}var k=new d(function(d,e){var f=a({},this._options.params);this._queue.push({method:b,params:a(f,c||{}),deferred:{resolve:d,reject:e},timeStart:m()}),this._maxQueueSize&&this._queue.length>=this._maxQueueSize?this._postToApi():null===this._batchTimeout&&(this._batchTimeout=setTimeout(this._postToApi.bind(this),1))}.bind(this));if(i){var g=(new Date).getTime(),l=e.cache===!0?1/0:g+1e3*e.cache;this._cache[i]={expires:l,promise:k}}return k},f.prototype._postToApi=function(){var a=k(this._queue),b={};for(var c in this._options.query)b[c]=this._options.query[c];var d=[];for(var e in b)b.hasOwnProperty(e)&&d.push(e+"="+b[e]);var f=d.join("&");this._http.post({body:a,url:this._endpoint+"?"+f,cookies:this._options.cookies,clientId:this._options.clientId,secret:this._options.secret,headers:this._options.headers||{},timeStart:this._queueTimeStart}).then(g).then(h.bind(this,this._queue))["catch"](i.bind(this,this._queue)),this.resetQueue()};var g=function(a){var b=[],c=JSON.parse(a.body);for(var d in c)b.push(JSON.parse(c[d]));return b},h=function(a,b){for(var c in a){var d=b[c];if(null==d&&(d={result:null,stat:"ok"}),d.stat&&this._events.hasOwnProperty(d.stat))for(var e in this._events[d.stat])this._events[d.stat][e](a[c],d);d.stat&&"ok"!==d.stat?a[c].deferred.reject(d):a[c].deferred.resolve(d)}return b},i=function(a,b){for(var c in a)a[c].deferred.reject(b);return b};f.prototype.resetQueue=function(){null!==this._batchTimeout&&(clearTimeout(this._batchTimeout),this._batchTimeout=null),this._queue=[]},f.prototype.on=function(a,b){this._events.hasOwnProperty(a)||(this._events[a]=[]),this._events[a].push(b)};var j=function(b,c){var d=require("./http_adapter/node"),e=new d;return function(d,g,h){var i={query:{application_id:"user",format:"JSON"},params:{api_signature:""},cookies:d.headers&&d.headers.cookie,headers:{}};if(c&&c.passHeaders)for(var j=0,k=c.passHeaders.length;j<k;j++){var l=c.passHeaders[j];d.headers.hasOwnProperty(l)&&(i.headers[l]=d.headers[l])}d.api=new f(b,a(i,c||{}),e),h()}},k=function(a){var b=[];for(var c in a){var d=l(a[c]);b.push(d)}return"\n"+b.join("\n")+"\n"},l=function(a){var b=["method="+encodeURIComponent(a.method)];for(var c in a.params)null!==a.params[c]&&a.params.hasOwnProperty(c)&&b.push(n(c,a.params[c]));return b.join("&")},m=function(){if(process&&"function"==typeof process.hrtime)return process.hrtime();if(window&&window.performance&&"function"==typeof window.performance.now){var a=window.performance.now().toString();if(a.match(/^[0-9]+\.[0-9]+$/))return a.split(".").map(function(a){return parseInt(a)})}return[(new Date).getTime(),0]},n=function(a,b){var c=typeof b;switch(c){case"string":case"number":case"boolean":return o(a,b);case"undefined":return o(a,"");case"object":return null===b?o(a,b):p(a,b);default:throw new Error("Unable to parameterize key "+a+" with type "+c)}},o=function(a,b){return encodeURIComponent(a)+"="+encodeURIComponent(b)},p=function(a,b){var c=[];if(Array.isArray(b))for(var d=0,e=b.length;d<e;d++)c.push(encodeURIComponent(a)+"[]="+encodeURIComponent(b[d]));else for(var f in b)b.hasOwnProperty(f)&&c.push(encodeURIComponent(a)+"["+encodeURIComponent(f)+"]="+encodeURIComponent(b[f]));return c.join("&")};"undefined"!=typeof module&&module.exports?(module.exports.Client=f,module.exports.middleware=j):b.TaggedApi=f}();
\ No newline at end of file
diff --git a/api-client.js b/api-client.js
index 990436e..90fb5c0 100644
--- a/api-client.js
+++ b/api-client.js
@@ -1,52 +1,62 @@
-var VanillaAdapter = function(XMLHttpRequest, Promise) {
-    this._xmlhttprequest = XMLHttpRequest;
-    this._headers = {
-        'X-Requested-With': 'XMLHttpRequest',
-        'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+(function() {
+    var context = typeof exports !== 'undefined' ? exports : window;
+
+    var VanillaAdapter = function(XMLHttpRequest, Promise) {
+        this._xmlhttprequest = XMLHttpRequest;
+        this._headers = {
+            'X-Requested-With': 'XMLHttpRequest',
+            'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+        };
+        this._promise = Promise;
+        this._timeout = 10000;
+    }
+
+    VanillaAdapter.prototype.setTimeout = function(timeout) {
+        this._timeout = parseInt(timeout, 10) || timeout;
+    }
+
+    VanillaAdapter.prototype.setHeader = function(key, value) {
+        this._headers[key] = value;
     };
-    this._promise = Promise;
-    this._timeout = 10000;
-}
-
-VanillaAdapter.prototype.setTimeout = function(timeout) {
-    this._timeout = parseInt(timeout, 10) || timeout;
-}
-
-VanillaAdapter.prototype.setHeader = function(key, value) {
-    this._headers[key] = value;
-};
-
-VanillaAdapter.prototype.setHeaders = function(headers) {
-    for (var key in headers) {
-        if (!headers.hasOwnProperty(key)) {
-            continue;
+
+    VanillaAdapter.prototype.setHeaders = function(headers) {
+        for (var key in headers) {
+            if (!headers.hasOwnProperty(key)) {
+                continue;
+            }
+            this.setHeader(key, headers[key]);
         }
-        this.setHeader(key, headers[key]);
-    }
-};
-
-VanillaAdapter.prototype.post = function(req) {
-    return new this._promise(function(resolve, reject) {
-        var xhr = new this._xmlhttprequest();
-        xhr.open('POST', req.url, true);
-        Object.keys(this._headers).forEach(function(key) {
-            xhr.setRequestHeader(key, this._headers[key]);
+    };
+
+    VanillaAdapter.prototype.post = function(req) {
+        return new this._promise(function(resolve, reject) {
+            var xhr = new this._xmlhttprequest();
+            xhr.open('POST', req.url, true);
+            Object.keys(this._headers).forEach(function(key) {
+                xhr.setRequestHeader(key, this._headers[key]);
+            }.bind(this));
+            xhr.timeout = this._timeout;
+            xhr.onreadystatechange = function() {
+                if (xhr.readyState !== 4) return;
+                try {
+                    var body = JSON.parse(xhr.responseText);
+                } catch (e) {
+                    reject(e);
+                }
+                resolve(body);
+            };
+            xhr.send(req.body);
         }.bind(this));
-        xhr.timeout = this._timeout;
-        xhr.onreadystatechange = function() {
-            if (xhr.readyState !== 4) return;
-            try {
-                var body = JSON.parse(xhr.responseText);
-            } catch (e) {
-                reject(e);
-            }
-            resolve(body);
-        };
-        xhr.send(req.body);
-    }.bind(this));
-}
+    }
 
-module.exports = VanillaAdapter;
+    if (typeof module !== 'undefined' && module.exports) {
+        // We're in a commonjs environment
+        module.exports.VanillaAdapter = VanillaAdapter;
+    } else {
+        // All other environments, expose TaggedApi globally
+        context.TaggedApiVanillaAdapter = VanillaAdapter;
+    }
+})(this);
 
 // This file may run in a browser, so wrap it in an IIFE.
 (function() {
@@ -74,8 +84,8 @@ module.exports = VanillaAdapter;
     var TaggedApi = function(endpoint, options, http) {
         this._endpoint = endpoint;
 
-        // Default to the vanilla adapter should clients not pass adapter
-        this._http = (typeof http !== 'undefined') ? http : new VanillaAdapter(context.XMLHttpRequest, context.Promise || require('bluebird'));
+        // HTTP adapter to perform HTTP requests
+        this._http = http;
 
         // API calls that are made within a single JS execution frame will be added
         // to the queue and processed as a whole on the next tick.
@@ -309,7 +319,7 @@ module.exports = VanillaAdapter;
         this._events[stat].push(callback);
     };
 
-    TaggedApi.middleware = function(url, options) {
+    var middleware = function(url, options) {
         var NodeAdapter = require('./http_adapter/node');
         var http = new NodeAdapter();
 
@@ -470,15 +480,12 @@ module.exports = VanillaAdapter;
         return obj1;
     }
 
-    if (typeof exports !== 'undefined') {
-        // We're in a nodejs environment, export this module
-        module.exports = TaggedApi;
+    if (typeof module !== 'undefined' && module.exports) {
+        // We're in a commonjs environment
+        module.exports.Client = TaggedApi;
+        module.exports.middleware = middleware;
     } else {
-        // We're in a browser environment, expose this module globally
+        // All other environments, expose TaggedApi globally
         context.TaggedApi = TaggedApi;
     }
 })();
-
-(function(context) {
-    context.TaggedApi = TaggedApi;
-})(window);
diff --git a/lib/http_adapter/vanilla.js b/lib/http_adapter/vanilla.js
index d15b072..f0021a0 100644
--- a/lib/http_adapter/vanilla.js
+++ b/lib/http_adapter/vanilla.js
@@ -1,49 +1,59 @@
-var VanillaAdapter = function(XMLHttpRequest, Promise) {
-    this._xmlhttprequest = XMLHttpRequest;
-    this._headers = {
-        'X-Requested-With': 'XMLHttpRequest',
-        'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
-    };
-    this._promise = Promise;
-    this._timeout = 10000;
-}
+(function() {
+    var context = typeof exports !== 'undefined' ? exports : window;
 
-VanillaAdapter.prototype.setTimeout = function(timeout) {
-    this._timeout = parseInt(timeout, 10) || timeout;
-}
+    var VanillaAdapter = function(XMLHttpRequest, Promise) {
+        this._xmlhttprequest = XMLHttpRequest;
+        this._headers = {
+            'X-Requested-With': 'XMLHttpRequest',
+            'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+        };
+        this._promise = Promise;
+        this._timeout = 10000;
+    }
 
-VanillaAdapter.prototype.setHeader = function(key, value) {
-    this._headers[key] = value;
-};
+    VanillaAdapter.prototype.setTimeout = function(timeout) {
+        this._timeout = parseInt(timeout, 10) || timeout;
+    }
 
-VanillaAdapter.prototype.setHeaders = function(headers) {
-    for (var key in headers) {
-        if (!headers.hasOwnProperty(key)) {
-            continue;
+    VanillaAdapter.prototype.setHeader = function(key, value) {
+        this._headers[key] = value;
+    };
+
+    VanillaAdapter.prototype.setHeaders = function(headers) {
+        for (var key in headers) {
+            if (!headers.hasOwnProperty(key)) {
+                continue;
+            }
+            this.setHeader(key, headers[key]);
         }
-        this.setHeader(key, headers[key]);
-    }
-};
+    };
 
-VanillaAdapter.prototype.post = function(req) {
-    return new this._promise(function(resolve, reject) {
-        var xhr = new this._xmlhttprequest();
-        xhr.open('POST', req.url, true);
-        Object.keys(this._headers).forEach(function(key) {
-            xhr.setRequestHeader(key, this._headers[key]);
+    VanillaAdapter.prototype.post = function(req) {
+        return new this._promise(function(resolve, reject) {
+            var xhr = new this._xmlhttprequest();
+            xhr.open('POST', req.url, true);
+            Object.keys(this._headers).forEach(function(key) {
+                xhr.setRequestHeader(key, this._headers[key]);
+            }.bind(this));
+            xhr.timeout = this._timeout;
+            xhr.onreadystatechange = function() {
+                if (xhr.readyState !== 4) return;
+                try {
+                    var body = JSON.parse(xhr.responseText);
+                } catch (e) {
+                    reject(e);
+                }
+                resolve(body);
+            };
+            xhr.send(req.body);
         }.bind(this));
-        xhr.timeout = this._timeout;
-        xhr.onreadystatechange = function() {
-            if (xhr.readyState !== 4) return;
-            try {
-                var body = JSON.parse(xhr.responseText);
-            } catch (e) {
-                reject(e);
-            }
-            resolve(body);
-        };
-        xhr.send(req.body);
-    }.bind(this));
-}
+    }
 
-module.exports = VanillaAdapter;
+    if (typeof module !== 'undefined' && module.exports) {
+        // We're in a commonjs environment
+        module.exports.VanillaAdapter = VanillaAdapter;
+    } else {
+        // All other environments, expose TaggedApi globally
+        context.TaggedApiVanillaAdapter = VanillaAdapter;
+    }
+})(this);
diff --git a/lib/index.js b/lib/index.js
index 829ed7d..03daef2 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -24,8 +24,8 @@
     var TaggedApi = function(endpoint, options, http) {
         this._endpoint = endpoint;
 
-        // Default to the vanilla adapter should clients not pass adapter
-        this._http = (typeof http !== 'undefined') ? http : new VanillaAdapter(context.XMLHttpRequest, context.Promise || require('bluebird'));
+        // HTTP adapter to perform HTTP requests
+        this._http = http;
 
         // API calls that are made within a single JS execution frame will be added
         // to the queue and processed as a whole on the next tick.
@@ -259,7 +259,7 @@
         this._events[stat].push(callback);
     };
 
-    TaggedApi.middleware = function(url, options) {
+    var middleware = function(url, options) {
         var NodeAdapter = require('./http_adapter/node');
         var http = new NodeAdapter();
 
@@ -420,11 +420,12 @@
         return obj1;
     }
 
-    if (typeof exports !== 'undefined') {
-        // We're in a nodejs environment, export this module
-        module.exports = TaggedApi;
+    if (typeof module !== 'undefined' && module.exports) {
+        // We're in a commonjs environment
+        module.exports.Client = TaggedApi;
+        module.exports.middleware = middleware;
     } else {
-        // We're in a browser environment, expose this module globally
+        // All other environments, expose TaggedApi globally
         context.TaggedApi = TaggedApi;
     }
 })();
diff --git a/lib/vanilla.js b/lib/vanilla.js
deleted file mode 100644
index 2944d76..0000000
--- a/lib/vanilla.js
+++ /dev/null
@@ -1,3 +0,0 @@
-(function(context) {
-    context.TaggedApi = TaggedApi;
-})(window);
diff --git a/test/unit/lib/http_adapter/vanilla_test.js b/test/unit/lib/http_adapter/vanilla_test.js
index cb67843..78527c0 100644
--- a/test/unit/lib/http_adapter/vanilla_test.js
+++ b/test/unit/lib/http_adapter/vanilla_test.js
@@ -1,4 +1,4 @@
-var VanillaAdapter = require(LIB_DIR + '/http_adapter/vanilla');
+var VanillaAdapter = require(LIB_DIR + '/http_adapter/vanilla').VanillaAdapter;
 var Promise = require('bluebird');
 
 function mockXMLHttpRequestFactory() {
diff --git a/test/unit/lib/index_test.js b/test/unit/lib/index_test.js
index 05ee5e9..3649e18 100644
--- a/test/unit/lib/index_test.js
+++ b/test/unit/lib/index_test.js
@@ -1,5 +1,6 @@
 /*jshint expr: true*/
-var TaggedAPI = require(LIB_DIR);
+var TaggedAPI = require(LIB_DIR).Client;
+var middleware = require(LIB_DIR).middleware;
 var HttpMock = require('./mocks/http.js');
 
 describe('Tagged API', function() {
@@ -330,7 +331,7 @@ describe('Tagged API', function() {
             this.req = {};
             this.res = {};
             this.next = sinon.spy();
-            this.middleware = TaggedAPI.middleware();
+            this.middleware = middleware();
         });
 
         it('returns a function', function() {
@@ -360,7 +361,7 @@ describe('Tagged API', function() {
         });
 
         it('passes headers in whitelist to api instance', function() {
-            this.middleware = TaggedAPI.middleware('anything', {
+            this.middleware = middleware('anything', {
                 passHeaders: ['foo', 'bar']
             });
             this.req.headers = {