diff --git a/.eslintrc.js b/.eslintrc.js
index 1b89b09..6ce976d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -28,6 +28,7 @@ module.exports = {
     "no-extra-boolean-cast": 0,
     "no-lonely-if": 0,
     "no-underscore-dangle": 0,
+    "import/prefer-default-export": 0,
     'import/extensions': ['error', 'always', {
       "js": "never"
     }]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b13789..732bf85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1,7 @@
+## 3.0.0
+- Rename class and global variable `VueLocalStorage` to `VueStorage`
 
+## 2.4.0
+ - Added session storage
+ - Added memory storage
+ - Added the ability to name a variable
diff --git a/build/rollup.config.js b/build/rollup.config.js
index 39bfdf0..b3d4907 100644
--- a/build/rollup.config.js
+++ b/build/rollup.config.js
@@ -1,9 +1,11 @@
 import babel from 'rollup-plugin-babel';
 import uglify from 'rollup-plugin-uglify';
+import localResolve from 'rollup-plugin-local-resolve';
 
 export default {
   input: 'src/index.js',
   plugins: [
+    localResolve(),
     babel({
       babelrc: false,
       presets: [
@@ -37,6 +39,6 @@ export default {
   output: {
     file: process.env.NODE_ENV === 'production' ? 'dist/vue-ls.min.js' : 'dist/vue-ls.js',
     format: 'umd',
-    name: 'VueLocalStorage',
+    name: 'VueStorage',
   }
 };
diff --git a/dist/vue-ls.js b/dist/vue-ls.js
index 673e34c..32fdb23 100644
--- a/dist/vue-ls.js
+++ b/dist/vue-ls.js
@@ -1,196 +1,128 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.VueLocalStorage = factory());
+	(global.VueStorage = factory());
 }(this, (function () { 'use strict';
 
-var ls = {};
-
-var memoryStorage = {
-  /**
-   * Get item
-   *
-   * @param {string} name
-   * @returns {*}
-   */
-  getItem: function getItem(name) {
-    return name in ls ? ls[name] : null;
-  },
-
-
-  /**
-   * Set item
-   *
-   * @param {string} name
-   * @param {*} value
-   * @returns {boolean}
-   */
-  setItem: function setItem(name, value) {
-    ls[name] = value;
-
-    return true;
-  },
-
-
-  /**
-   * Remove item
-   *
-   * @param {string} name
-   * @returns {boolean}
-   */
-  removeItem: function removeItem(name) {
-    var found = name in ls;
-
-    if (found) {
-      return delete ls[name];
-    }
-
-    return false;
-  },
-
-
-  /**
-   * Clear storage
-   *
-   * @returns {boolean}
-   */
-  clear: function clear() {
-    ls = {};
-
-    return true;
-  },
-
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
-  /**
-   * Get item by key
-   *
-   * @param {number} index
-   * @returns {*}
-   */
-  key: function key(index) {
-    var keys = Object.keys(ls);
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-    return typeof keys[index] !== 'undefined' ? keys[index] : null;
-  }
-};
+var ls = {};
 
-Object.defineProperty(memoryStorage, 'length', {
-  /**
-   * Define length property
-   *
-   * @return {number}
-   */
-  get: function get() {
-    return Object.keys(ls).length;
+var MemoryStorage = function () {
+  function MemoryStorage() {
+    _classCallCheck(this, MemoryStorage);
   }
-});
-
-var _createClass$1 = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
-function _classCallCheck$1(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-var listeners = {};
-
-/**
- * Event class
- */
+  _createClass(MemoryStorage, null, [{
+    key: 'getItem',
 
-var _class$1 = function () {
-  function _class() {
-    _classCallCheck$1(this, _class);
-  }
-
-  _createClass$1(_class, null, [{
-    key: 'on',
+    /**
+     * Get item
+     *
+     * @param {string} name
+     * @returns {*}
+     */
+    value: function getItem(name) {
+      return name in ls ? ls[name] : null;
+    }
 
     /**
-     * Add storage change event
+     * Set item
      *
      * @param {string} name
-     * @param {Function} callback
+     * @param {*} value
+     * @returns {boolean}
      */
-    value: function on(name, callback) {
-      if (typeof listeners[name] === 'undefined') {
-        listeners[name] = [];
-      }
 
-      listeners[name].push(callback);
+  }, {
+    key: 'setItem',
+    value: function setItem(name, value) {
+      ls[name] = value;
+
+      return true;
     }
 
     /**
-     * Remove storage change event
+     * Remove item
      *
      * @param {string} name
-     * @param {Function} callback
+     * @returns {boolean}
      */
 
   }, {
-    key: 'off',
-    value: function off(name, callback) {
-      if (listeners[name].length) {
-        listeners[name].splice(listeners[name].indexOf(callback), 1);
-      } else {
-        listeners[name] = [];
+    key: 'removeItem',
+    value: function removeItem(name) {
+      var found = name in ls;
+
+      if (found) {
+        return delete ls[name];
       }
+
+      return false;
     }
 
     /**
-     * Emit event
+     * Clear storage
      *
-     * @param {Object} event
+     * @returns {boolean}
      */
 
   }, {
-    key: 'emit',
-    value: function emit(event) {
-      var e = event || window.event;
+    key: 'clear',
+    value: function clear() {
+      ls = {};
 
-      var getValue = function getValue(data) {
-        try {
-          return JSON.parse(data).value;
-        } catch (err) {
-          return data;
-        }
-      };
+      return true;
+    }
 
-      var fire = function fire(listener) {
-        var newValue = getValue(e.newValue);
-        var oldValue = getValue(e.oldValue);
+    /**
+     * Get item by key
+     *
+     * @param {number} index
+     * @returns {*}
+     */
 
-        listener(newValue, oldValue, e.url || e.uri);
-      };
+  }, {
+    key: 'key',
+    value: function key(index) {
+      var keys = Object.keys(ls);
 
-      if (typeof e === 'undefined' || typeof e.key === 'undefined') {
-        return;
-      }
+      return typeof keys[index] !== 'undefined' ? keys[index] : null;
+    }
 
-      var all = listeners[e.key];
+    /**
+     * Define length property
+     *
+     * @return {number}
+     */
 
-      if (typeof all !== 'undefined') {
-        all.forEach(fire);
-      }
+  }, {
+    key: 'length',
+    get: function get() {
+      return Object.keys(ls).length;
     }
   }]);
 
-  return _class;
+  return MemoryStorage;
 }();
 
 var _extends$1 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _createClass$1 = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _classCallCheck$1(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 /**
  * Storage Bridge
  */
-
-var _class = function () {
+var WebStorage$$1 = function () {
   /**
    * @param {Object} storage
    */
-  function _class(storage) {
-    _classCallCheck(this, _class);
+  function WebStorage$$1(storage) {
+    _classCallCheck$1(this, WebStorage$$1);
 
     this.storage = storage;
     this.options = {
@@ -212,11 +144,11 @@ var _class = function () {
     if (typeof window !== 'undefined') {
       for (var i in this.options.events) {
         if (window.addEventListener) {
-          window.addEventListener(this.options.events[i], _class$1.emit, false);
+          window.addEventListener(this.options.events[i], WebStorageEvent.emit, false);
         } else if (window.attachEvent) {
-          window.attachEvent('on' + this.options.events[i], _class$1.emit);
+          window.attachEvent('on' + this.options.events[i], WebStorageEvent.emit);
         } else {
-          window['on' + this.options.events[i]] = _class$1.emit;
+          window['on' + this.options.events[i]] = WebStorageEvent.emit;
         }
       }
     }
@@ -229,7 +161,7 @@ var _class = function () {
    */
 
 
-  _createClass(_class, [{
+  _createClass$1(WebStorage$$1, [{
     key: 'setOptions',
     value: function setOptions() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -359,7 +291,55 @@ var _class = function () {
   }, {
     key: 'on',
     value: function on(name, callback) {
-      _class$1.on(this.options.namespace + name, callback);
+      WebStorageEvent.on(this.options.namespace + name, callback);
+    }
+
+    /**
+     * Remove storage change event
+     *
+     * @param {string} name
+     * @param {Function} callback
+     */
+
+  }, {
+    key: 'off',
+    value: function off(name, callback) {
+      WebStorageEvent.off(this.options.namespace + name, callback);
+    }
+  }]);
+
+  return WebStorage$$1;
+}();
+
+var _createClass$2 = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+function _classCallCheck$2(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var listeners = {};
+
+/**
+ * Event class
+ */
+var WebStorageEvent = function () {
+  function WebStorageEvent() {
+    _classCallCheck$2(this, WebStorageEvent);
+  }
+
+  _createClass$2(WebStorageEvent, null, [{
+    key: 'on',
+
+    /**
+     * Add storage change event
+     *
+     * @param {string} name
+     * @param {Function} callback
+     */
+    value: function on(name, callback) {
+      if (typeof listeners[name] === 'undefined') {
+        listeners[name] = [];
+      }
+
+      listeners[name].push(callback);
     }
 
     /**
@@ -372,31 +352,75 @@ var _class = function () {
   }, {
     key: 'off',
     value: function off(name, callback) {
-      _class$1.off(this.options.namespace + name, callback);
+      if (listeners[name].length) {
+        listeners[name].splice(listeners[name].indexOf(callback), 1);
+      } else {
+        listeners[name] = [];
+      }
+    }
+
+    /**
+     * Emit event
+     *
+     * @param {Object} event
+     */
+
+  }, {
+    key: 'emit',
+    value: function emit(event) {
+      var e = event || window.event;
+
+      var getValue = function getValue(data) {
+        try {
+          return JSON.parse(data).value;
+        } catch (err) {
+          return data;
+        }
+      };
+
+      var fire = function fire(listener) {
+        var newValue = getValue(e.newValue);
+        var oldValue = getValue(e.oldValue);
+
+        listener(newValue, oldValue, e.url || e.uri);
+      };
+
+      if (typeof e === 'undefined' || typeof e.key === 'undefined') {
+        return;
+      }
+
+      var all = listeners[e.key];
+
+      if (typeof all !== 'undefined') {
+        all.forEach(fire);
+      }
     }
   }]);
 
-  return _class;
+  return WebStorageEvent;
 }();
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
+// eslint-disable-next-line
+var _global = typeof window !== 'undefined' ? window : global || {};
+
 /**
- * @type {{install: (function(Object, Object): Storage)}}
+ * @type {{install: (function(Object, Object): WebStorage)}}
  */
-var VueLocalStorage = {
+var VueStorage = {
   /**
    * Install plugin
    *
    * @param {Object} Vue
    * @param {Object} options
-   * @returns {Storage}
+   * @returns {WebStorage}
    */
   install: function install(Vue) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
     var _options = _extends({}, options, {
-      storage: !!options.storage ? options.storage : 'local',
+      storage: options.storage || 'local',
       name: options.name || 'ls'
     });
 
@@ -408,24 +432,24 @@ var VueLocalStorage = {
 
     switch (_options.storage) {// eslint-disable-line
       case 'local':
-        store = typeof window !== 'undefined' && 'localStorage' in window ? window.localStorage : null;
+        store = 'localStorage' in _global ? _global.localStorage : null;
         break;
 
       case 'session':
-        store = typeof window !== 'undefined' && 'sessionStorage' in window ? window.sessionStorage : null;
+        store = 'sessionStorage' in _global ? _global.sessionStorage : null;
         break;
       case 'memory':
-        store = memoryStorage;
+        store = MemoryStorage;
         break;
     }
 
     if (!store) {
-      store = memoryStorage;
+      store = MemoryStorage;
       // eslint-disable-next-line
       console.error('Vue-ls: Storage "' + _options.storage + '" is not supported your system, use memory storage');
     }
 
-    var ls = new _class(store);
+    var ls = new WebStorage$$1(store);
 
     ls.setOptions(_extends(ls.options, {
       namespace: ''
@@ -436,7 +460,7 @@ var VueLocalStorage = {
       /**
        * Define $ls property
        *
-       * @return {Storage}
+       * @return {WebStorage}
        */
       get: function get() {
         return ls;
@@ -445,10 +469,8 @@ var VueLocalStorage = {
   }
 };
 
-if (typeof window !== 'undefined') {
-  window.VueLocalStorage = VueLocalStorage;
-}
+_global.VueStorage = VueStorage;
 
-return VueLocalStorage;
+return VueStorage;
 
 })));
diff --git a/dist/vue-ls.min.js b/dist/vue-ls.min.js
index c2b2130..d54749f 100644
--- a/dist/vue-ls.min.js
+++ b/dist/vue-ls.min.js
@@ -1 +1 @@
-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):e.VueLocalStorage=n()}(this,function(){"use strict";var e={},n={getItem:function(n){return n in e?e[n]:null},setItem:function(n,t){return e[n]=t,!0},removeItem:function(n){return!!(n in e)&&delete e[n]},clear:function(){return e={},!0},key:function(n){var t=Object.keys(e);return void 0!==t[n]?t[n]:null}};Object.defineProperty(n,"length",{get:function(){return Object.keys(e).length}});var t=function(){function e(e,n){for(var t=0;t<n.length;t++){var o=n[t];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(n,t,o){return t&&e(n.prototype,t),o&&e(n,o),n}}();var o={},r=function(){function e(){!function(e,n){if(!(e instanceof n))throw new TypeError("Cannot call a class as a function")}(this,e)}return t(e,null,[{key:"on",value:function(e,n){void 0===o[e]&&(o[e]=[]),o[e].push(n)}},{key:"off",value:function(e,n){o[e].length?o[e].splice(o[e].indexOf(n),1):o[e]=[]}},{key:"emit",value:function(e){var n=e||window.event,t=function(e){try{return JSON.parse(e).value}catch(n){return e}};if(void 0!==n&&void 0!==n.key){var r=o[n.key];void 0!==r&&r.forEach(function(e){e(t(n.newValue),t(n.oldValue),n.url||n.uri)})}}}]),e}(),i=Object.assign||function(e){for(var n=1;n<arguments.length;n++){var t=arguments[n];for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o])}return e},a=function(){function e(e,n){for(var t=0;t<n.length;t++){var o=n[t];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(n,t,o){return t&&e(n.prototype,t),o&&e(n,o),n}}();var s=function(){function e(n){if(function(e,n){if(!(e instanceof n))throw new TypeError("Cannot call a class as a function")}(this,e),this.storage=n,this.options={namespace:"",events:["storage"]},Object.defineProperty(this,"length",{get:function(){return this.storage.length}}),"undefined"!=typeof window)for(var t in this.options.events)window.addEventListener?window.addEventListener(this.options.events[t],r.emit,!1):window.attachEvent?window.attachEvent("on"+this.options.events[t],r.emit):window["on"+this.options.events[t]]=r.emit}return a(e,[{key:"setOptions",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};this.options=i(this.options,e)}},{key:"set",value:function(e,n){var t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:null,o=JSON.stringify({value:n,expire:null!==t?(new Date).getTime()+t:null});this.storage.setItem(this.options.namespace+e,o)}},{key:"get",value:function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null,t=this.storage.getItem(this.options.namespace+e);if(null!==t)try{var o=JSON.parse(t);if(null===o.expire)return o.value;if(o.expire>=(new Date).getTime())return o.value;this.remove(e)}catch(e){return n}return n}},{key:"key",value:function(e){return this.storage.key(e)}},{key:"remove",value:function(e){return this.storage.removeItem(this.options.namespace+e)}},{key:"clear",value:function(){if(0!==this.length){for(var e=[],n=0;n<this.length;n++){var t=this.storage.key(n);!1!==new RegExp("^"+this.options.namespace+".+","i").test(t)&&e.push(t)}for(var o in e)this.storage.removeItem(e[o])}}},{key:"on",value:function(e,n){r.on(this.options.namespace+e,n)}},{key:"off",value:function(e,n){r.off(this.options.namespace+e,n)}}]),e}(),u=Object.assign||function(e){for(var n=1;n<arguments.length;n++){var t=arguments[n];for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o])}return e},l={install:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},o=u({},t,{storage:t.storage?t.storage:"local",name:t.name||"ls"});if(o.storage&&-1===["memory","local","session"].indexOf(o.storage))throw new Error('Vue-ls: Storage "'+o.storage+'" is not supported');var r=null;switch(o.storage){case"local":r="undefined"!=typeof window&&"localStorage"in window?window.localStorage:null;break;case"session":r="undefined"!=typeof window&&"sessionStorage"in window?window.sessionStorage:null;break;case"memory":r=n}r||(r=n,console.error('Vue-ls: Storage "'+o.storage+'" is not supported your system, use memory storage'));var i=new s(r);i.setOptions(u(i.options,{namespace:""},o||{})),e[o.name]=i,Object.defineProperty(e.prototype,"$"+o.name,{get:function(){return i}})}};return"undefined"!=typeof window&&(window.VueLocalStorage=l),l});
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):e.VueStorage=n()}(this,function(){"use strict";var e=function(){function e(e,n){for(var t=0;t<n.length;t++){var o=n[t];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(n,t,o){return t&&e(n.prototype,t),o&&e(n,o),n}}();var n={},t=function(){function t(){!function(e,n){if(!(e instanceof n))throw new TypeError("Cannot call a class as a function")}(this,t)}return e(t,null,[{key:"getItem",value:function(e){return e in n?n[e]:null}},{key:"setItem",value:function(e,t){return n[e]=t,!0}},{key:"removeItem",value:function(e){return!!(e in n)&&delete n[e]}},{key:"clear",value:function(){return n={},!0}},{key:"key",value:function(e){var t=Object.keys(n);return void 0!==t[e]?t[e]:null}},{key:"length",get:function(){return Object.keys(n).length}}]),t}(),o=Object.assign||function(e){for(var n=1;n<arguments.length;n++){var t=arguments[n];for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o])}return e},r=function(){function e(e,n){for(var t=0;t<n.length;t++){var o=n[t];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(n,t,o){return t&&e(n.prototype,t),o&&e(n,o),n}}();var i=function(){function e(n){if(function(e,n){if(!(e instanceof n))throw new TypeError("Cannot call a class as a function")}(this,e),this.storage=n,this.options={namespace:"",events:["storage"]},Object.defineProperty(this,"length",{get:function(){return this.storage.length}}),"undefined"!=typeof window)for(var t in this.options.events)window.addEventListener?window.addEventListener(this.options.events[t],u.emit,!1):window.attachEvent?window.attachEvent("on"+this.options.events[t],u.emit):window["on"+this.options.events[t]]=u.emit}return r(e,[{key:"setOptions",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};this.options=o(this.options,e)}},{key:"set",value:function(e,n){var t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:null,o=JSON.stringify({value:n,expire:null!==t?(new Date).getTime()+t:null});this.storage.setItem(this.options.namespace+e,o)}},{key:"get",value:function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null,t=this.storage.getItem(this.options.namespace+e);if(null!==t)try{var o=JSON.parse(t);if(null===o.expire)return o.value;if(o.expire>=(new Date).getTime())return o.value;this.remove(e)}catch(e){return n}return n}},{key:"key",value:function(e){return this.storage.key(e)}},{key:"remove",value:function(e){return this.storage.removeItem(this.options.namespace+e)}},{key:"clear",value:function(){if(0!==this.length){for(var e=[],n=0;n<this.length;n++){var t=this.storage.key(n);!1!==new RegExp("^"+this.options.namespace+".+","i").test(t)&&e.push(t)}for(var o in e)this.storage.removeItem(e[o])}}},{key:"on",value:function(e,n){u.on(this.options.namespace+e,n)}},{key:"off",value:function(e,n){u.off(this.options.namespace+e,n)}}]),e}(),a=function(){function e(e,n){for(var t=0;t<n.length;t++){var o=n[t];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(n,t,o){return t&&e(n.prototype,t),o&&e(n,o),n}}();var s={},u=function(){function e(){!function(e,n){if(!(e instanceof n))throw new TypeError("Cannot call a class as a function")}(this,e)}return a(e,null,[{key:"on",value:function(e,n){void 0===s[e]&&(s[e]=[]),s[e].push(n)}},{key:"off",value:function(e,n){s[e].length?s[e].splice(s[e].indexOf(n),1):s[e]=[]}},{key:"emit",value:function(e){var n=e||window.event,t=function(e){try{return JSON.parse(e).value}catch(n){return e}};if(void 0!==n&&void 0!==n.key){var o=s[n.key];void 0!==o&&o.forEach(function(e){e(t(n.newValue),t(n.oldValue),n.url||n.uri)})}}}]),e}(),l=Object.assign||function(e){for(var n=1;n<arguments.length;n++){var t=arguments[n];for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o])}return e},c="undefined"!=typeof window?window:global||{},f={install:function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},o=l({},n,{storage:n.storage||"local",name:n.name||"ls"});if(o.storage&&-1===["memory","local","session"].indexOf(o.storage))throw new Error('Vue-ls: Storage "'+o.storage+'" is not supported');var r=null;switch(o.storage){case"local":r="localStorage"in c?c.localStorage:null;break;case"session":r="sessionStorage"in c?c.sessionStorage:null;break;case"memory":r=t}r||(r=t,console.error('Vue-ls: Storage "'+o.storage+'" is not supported your system, use memory storage'));var a=new i(r);a.setOptions(l(a.options,{namespace:""},o||{})),e[o.name]=a,Object.defineProperty(e.prototype,"$"+o.name,{get:function(){return a}})}};return c.VueStorage=f,f});
diff --git a/examples/counter/index.html b/examples/counter/index.html
index bdec4a8..9e4bb6a 100644
--- a/examples/counter/index.html
+++ b/examples/counter/index.html
@@ -19,7 +19,7 @@ <h1>Synchronized tab counter</h1>
     <script type="text/javascript" src="https://unpkg.com/vue@2.2.1"></script>
     <script type="text/javascript" src="../../dist/vue-ls.js"></script>
     <script type="text/javascript">
-        window.Vue.use(VueLocalStorage);
+        window.Vue.use(VueStorage);
 
         new window.Vue({
             el: '#app',
diff --git a/package.json b/package.json
index 0b2833f..2afa0e9 100644
--- a/package.json
+++ b/package.json
@@ -102,6 +102,7 @@
     "remove": "^0.1.5",
     "rollup": "^0.50.0",
     "rollup-plugin-babel": "^3.0.2",
+    "rollup-plugin-local-resolve": "^1.0.7",
     "rollup-plugin-uglify": "^3.0.0",
     "selenium-server": "^3.3.1",
     "serve-static": "^1.12.1",
diff --git a/src/index.js b/src/index.js
index a386297..5ea09aa 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,16 +1,18 @@
-import Memory from './memory';
-import Storage from './storage';
+import { MemoryStorageInterface, WebStorage } from './storage';
+
+// eslint-disable-next-line
+const _global = (typeof window !== 'undefined' ? window : global || {});
 
 /**
- * @type {{install: (function(Object, Object): Storage)}}
+ * @type {{install: (function(Object, Object): WebStorage)}}
  */
-const VueLocalStorage = {
+const VueStorage = {
   /**
    * Install plugin
    *
    * @param {Object} Vue
    * @param {Object} options
-   * @returns {Storage}
+   * @returns {WebStorage}
    */
   install(Vue, options = {}) {
     const _options = Object.assign({}, options, {
@@ -26,29 +28,29 @@ const VueLocalStorage = {
 
     switch(_options.storage) { // eslint-disable-line
       case 'local':
-        store = typeof window !== 'undefined' && 'localStorage' in window
-          ? window.localStorage
+        store = 'localStorage' in _global
+          ? _global.localStorage
           : null
         ;
         break;
 
       case 'session':
-        store = typeof window !== 'undefined' && 'sessionStorage' in window
-          ? window.sessionStorage
+        store = 'sessionStorage' in _global
+          ? _global.sessionStorage
           : null
         ;
         break;
-      case 'memory': store = Memory;
+      case 'memory': store = MemoryStorageInterface;
         break;
     }
 
     if (!store) {
-      store = Memory;
+      store = MemoryStorageInterface;
       // eslint-disable-next-line
       console.error(`Vue-ls: Storage "${_options.storage}" is not supported your system, use memory storage`);
     }
 
-    const ls = new Storage(store);
+    const ls = new WebStorage(store);
 
     ls.setOptions(Object.assign(ls.options, {
       namespace: '',
@@ -59,7 +61,7 @@ const VueLocalStorage = {
       /**
        * Define $ls property
        *
-       * @return {Storage}
+       * @return {WebStorage}
        */
       get() {
         return ls;
@@ -68,8 +70,6 @@ const VueLocalStorage = {
   },
 };
 
-if (typeof window !== 'undefined') {
-  window.VueLocalStorage = VueLocalStorage;
-}
+_global.VueStorage = VueStorage;
 
-export default VueLocalStorage;
+export default VueStorage;
diff --git a/src/memory.js b/src/storage/MemoryStorageInterface.js
similarity index 77%
rename from src/memory.js
rename to src/storage/MemoryStorageInterface.js
index 127f269..23ba233 100644
--- a/src/memory.js
+++ b/src/storage/MemoryStorageInterface.js
@@ -1,15 +1,15 @@
 let ls = {};
 
-const memoryStorage = {
+export class MemoryStorageInterface {
   /**
    * Get item
    *
    * @param {string} name
    * @returns {*}
    */
-  getItem(name) {
+  static getItem(name) {
     return name in ls ? ls[name] : null;
-  },
+  }
 
   /**
    * Set item
@@ -18,11 +18,11 @@ const memoryStorage = {
    * @param {*} value
    * @returns {boolean}
    */
-  setItem(name, value) {
+  static setItem(name, value) {
     ls[name] = value;
 
     return true;
-  },
+  }
 
   /**
    * Remove item
@@ -30,7 +30,7 @@ const memoryStorage = {
    * @param {string} name
    * @returns {boolean}
    */
-  removeItem(name) {
+  static removeItem(name) {
     const found = name in ls;
 
     if (found) {
@@ -38,18 +38,18 @@ const memoryStorage = {
     }
 
     return false;
-  },
+  }
 
   /**
    * Clear storage
    *
    * @returns {boolean}
    */
-  clear() {
+  static clear() {
     ls = {};
 
     return true;
-  },
+  }
 
   /**
    * Get item by key
@@ -57,22 +57,18 @@ const memoryStorage = {
    * @param {number} index
    * @returns {*}
    */
-  key(index) {
+  static key(index) {
     const keys = Object.keys(ls);
 
     return typeof keys[index] !== 'undefined' ? keys[index] : null;
-  },
-};
+  }
 
-Object.defineProperty(memoryStorage, 'length', {
   /**
    * Define length property
    *
    * @return {number}
    */
-  get() {
+  static get length() {
     return Object.keys(ls).length;
-  },
-});
-
-export default memoryStorage;
+  }
+}
diff --git a/src/storage.js b/src/storage/WebStorage.js
similarity index 86%
rename from src/storage.js
rename to src/storage/WebStorage.js
index 973963f..cf74237 100644
--- a/src/storage.js
+++ b/src/storage/WebStorage.js
@@ -1,9 +1,9 @@
-import StorageEvent from './event';
+import { WebStorageEvent } from './';
 
 /**
  * Storage Bridge
  */
-export default class {
+export class WebStorage {
   /**
    * @param {Object} storage
    */
@@ -28,11 +28,11 @@ export default class {
     if (typeof window !== 'undefined') {
       for (const i in this.options.events) {
         if (window.addEventListener) {
-          window.addEventListener(this.options.events[i], StorageEvent.emit, false);
+          window.addEventListener(this.options.events[i], WebStorageEvent.emit, false);
         } else if (window.attachEvent) {
-          window.attachEvent(`on${this.options.events[i]}`, StorageEvent.emit);
+          window.attachEvent(`on${this.options.events[i]}`, WebStorageEvent.emit);
         } else {
-          window[`on${this.options.events[i]}`] = StorageEvent.emit;
+          window[`on${this.options.events[i]}`] = WebStorageEvent.emit;
         }
       }
     }
@@ -147,7 +147,7 @@ export default class {
    * @param {Function} callback
    */
   on(name, callback) {
-    StorageEvent.on(this.options.namespace + name, callback);
+    WebStorageEvent.on(this.options.namespace + name, callback);
   }
 
   /**
@@ -157,6 +157,6 @@ export default class {
    * @param {Function} callback
    */
   off(name, callback) {
-    StorageEvent.off(this.options.namespace + name, callback);
+    WebStorageEvent.off(this.options.namespace + name, callback);
   }
 }
diff --git a/src/event.js b/src/storage/WebStorageEvent.js
similarity index 97%
rename from src/event.js
rename to src/storage/WebStorageEvent.js
index 4e2c4fc..7b8a005 100644
--- a/src/event.js
+++ b/src/storage/WebStorageEvent.js
@@ -3,7 +3,7 @@ const listeners = {};
 /**
  * Event class
  */
-export default class {
+export class WebStorageEvent {
   /**
    * Add storage change event
    *
diff --git a/src/storage/index.js b/src/storage/index.js
new file mode 100644
index 0000000..72b69e6
--- /dev/null
+++ b/src/storage/index.js
@@ -0,0 +1,9 @@
+import { MemoryStorageInterface } from './MemoryStorageInterface';
+import { WebStorage } from './WebStorage';
+import { WebStorageEvent } from './WebStorageEvent';
+
+export {
+  MemoryStorageInterface,
+  WebStorage,
+  WebStorageEvent,
+};
diff --git a/test/unit/ava/eventAttach.js b/test/unit/ava/eventAttach.js
index 5e1f1b7..ea3deba 100644
--- a/test/unit/ava/eventAttach.js
+++ b/test/unit/ava/eventAttach.js
@@ -1,8 +1,9 @@
+import Vue from 'vue';
 import test from 'ava';
+
 import './helpers/setupIEBrowserEnv'
 import Ls from '../../../src/index';
-import StorageEvent from '../../../src/event';
-import Vue from 'vue';
+import { WebStorageEvent } from '../../../src/storage';
 
 Vue.use(Ls);
 
@@ -19,16 +20,16 @@ test('Add/Remove event', (t) => {
   Vue.ls.off('item_two_test', () => {});
   Vue.ls.off('item_one_test', () => {});
 
-  StorageEvent.emit({
+  WebStorageEvent.emit({
     key: 'item_three_test',
     newValue: JSON.stringify({ value: 'val', expire: null }),
     oldValue: JSON.stringify({ value: 'old_val', expire: null }),
   });
-  StorageEvent.emit({
+  WebStorageEvent.emit({
     key: 'item_undefined_test',
     newValue: JSON.stringify({ value: 'val', expire: null }),
     oldValue: JSON.stringify({ value: 'old_val', expire: null }),
   });
-  StorageEvent.emit();
+  WebStorageEvent.emit();
 });
 
diff --git a/test/unit/ava/eventWindow.js b/test/unit/ava/eventWindow.js
index c8581b4..1afb662 100644
--- a/test/unit/ava/eventWindow.js
+++ b/test/unit/ava/eventWindow.js
@@ -1,8 +1,9 @@
+import Vue from 'vue';
 import test from 'ava';
+
 import './helpers/setupOldBrowserEnv'
 import Ls from '../../../src/index';
-import StorageEvent from '../../../src/event';
-import Vue from 'vue';
+import { WebStorageEvent } from '../../../src/storage';
 
 Vue.use(Ls);
 
@@ -19,16 +20,16 @@ test('Add/Remove event', (t) => {
   Vue.ls.off('item_two_test', () => {});
   Vue.ls.off('item_one_test', () => {});
 
-  StorageEvent.emit({
+  WebStorageEvent.emit({
     key: 'item_three_test',
     newValue: JSON.stringify({ value: 'val', expire: null }),
     oldValue: JSON.stringify({ value: 'old_val', expire: null }),
   });
-  StorageEvent.emit({
+  WebStorageEvent.emit({
     key: 'item_undefined_test',
     newValue: JSON.stringify({ value: 'val', expire: null }),
     oldValue: JSON.stringify({ value: 'old_val', expire: null }),
   });
-  StorageEvent.emit();
+  WebStorageEvent.emit();
 });
 
diff --git a/test/unit/ava/events.js b/test/unit/ava/events.js
index 244ea82..abcb4c6 100644
--- a/test/unit/ava/events.js
+++ b/test/unit/ava/events.js
@@ -1,8 +1,9 @@
+import Vue from 'vue';
 import test from 'ava';
+
 import './helpers/setupBrowserEnv'
 import Ls from '../../../src/index';
-import StorageEvent from '../../../src/event';
-import Vue from 'vue';
+import { WebStorageEvent } from '../../../src/storage';
 
 Vue.use(Ls);
 
@@ -25,21 +26,21 @@ test('Add/Remove event', (t) => {
   Vue.ls.off('item_one_test', () => {});
   Vue.ls.off('item_one_test', () => {});
 
-  StorageEvent.emit({
+  WebStorageEvent.emit({
     key: 'item_three_test',
     newValue: JSON.stringify({ value: 'val', expire: null }),
     oldValue: JSON.stringify({ value: 'old_val', expire: null }),
   });
-  StorageEvent.emit({
+  WebStorageEvent.emit({
     key: 'item_undefined_test',
     newValue: JSON.stringify({ value: 'val', expire: null }),
     oldValue: JSON.stringify({ value: 'old_val', expire: null }),
   });
-  StorageEvent.emit({
+  WebStorageEvent.emit({
     key: 'item_three_test',
     newValue: 'val',
     oldValue: 'old_val',
   });
-  StorageEvent.emit();
+  WebStorageEvent.emit();
 });
 
diff --git a/test/unit/ava/localStorage.js b/test/unit/ava/localStorage.js
index 13f7ba9..3e5338b 100644
--- a/test/unit/ava/localStorage.js
+++ b/test/unit/ava/localStorage.js
@@ -1,7 +1,8 @@
+import Vue from 'vue';
 import test from 'ava';
+
 import './helpers/setupBrowserEnv'
 import Ls from '../../../src/index';
-import Vue from 'vue';
 
 const namespace = 'test__';
 
diff --git a/test/unit/ava/memoryFallback.js b/test/unit/ava/memoryFallback.js
index 05d7e3c..961adbd 100644
--- a/test/unit/ava/memoryFallback.js
+++ b/test/unit/ava/memoryFallback.js
@@ -1,6 +1,7 @@
+import Vue from 'vue';
 import test from 'ava';
+
 import Ls from '../../../src/index';
-import Vue from 'vue';
 
 const namespace = 'test__';
 
diff --git a/test/unit/ava/memoryStorage.js b/test/unit/ava/memoryStorage.js
index 05920f4..0b13f04 100644
--- a/test/unit/ava/memoryStorage.js
+++ b/test/unit/ava/memoryStorage.js
@@ -1,7 +1,8 @@
+import Vue from 'vue';
 import test from 'ava';
+
 import './helpers/setupBrowserEnv'
 import Ls from '../../../src/index';
-import Vue from 'vue';
 
 const namespace = 'test__';
 
diff --git a/test/unit/ava/sessionStorage.js b/test/unit/ava/sessionStorage.js
index f0102c3..e6576d6 100644
--- a/test/unit/ava/sessionStorage.js
+++ b/test/unit/ava/sessionStorage.js
@@ -1,7 +1,8 @@
+import Vue from 'vue';
 import test from 'ava';
+
 import './helpers/setupBrowserEnv'
 import Ls from '../../../src/index';
-import Vue from 'vue';
 
 const namespace = 'test__';
 
diff --git a/test/unit/ava/unknownStorage.js b/test/unit/ava/unknownStorage.js
index 133ff89..6a8bc82 100644
--- a/test/unit/ava/unknownStorage.js
+++ b/test/unit/ava/unknownStorage.js
@@ -1,6 +1,7 @@
+import Vue from 'vue';
 import test from 'ava';
+
 import Ls from '../../../src/index';
-import Vue from 'vue';
 
 test('Test exception storage', (t) => {
   try {
diff --git a/yarn.lock b/yarn.lock
index 00d0949..1782825 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6120,6 +6120,10 @@ rollup-plugin-babel@^3.0.2:
   dependencies:
     rollup-pluginutils "^1.5.0"
 
+rollup-plugin-local-resolve@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-local-resolve/-/rollup-plugin-local-resolve-1.0.7.tgz#c486701716c15add2127565c2eaa101123320887"
+
 rollup-plugin-uglify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-uglify/-/rollup-plugin-uglify-3.0.0.tgz#a34eca24617709c6bf1778e9653baafa06099b86"