diff --git a/benchmark/result.html b/benchmark/result.html
index 3a300ad..c9a56e3 100644
--- a/benchmark/result.html
+++ b/benchmark/result.html
@@ -16,7 +16,7 @@
   });
 
   google.charts.setOnLoadCallback(function() {
-    var data = google.visualization.arrayToDataTable([["JS Libraries","Raw String","Interpolate","Plural","Plural Interpolate"],["Vue I18n",633465.3095226205,490751.674640999,572898.7072931823,432485.7407307202],["Polyglot.js",29182.762947133513,24878.02429291416,27809.533020522416,25380.31380766069],["i18next",74321.39049781616,37649.43738913464,127006.05444874118,36381.098756569176],["I18n.js",704126.2695885809,103471.83396635597,364390.557885891,111242.893023925],["Google Closure",2535803.442376795,330087.8306326557,262287.66588887724,174010.911750061],["FrenchKiss.js",20412579.72343485,7540249.012560963,9819267.856271362,7323430.074355557]]);
+    var data = google.visualization.arrayToDataTable([["JS Libraries","Raw String","Interpolate","Plural","Plural Interpolate"],["Vue I18n",879100.2661355529,591134.2317386126,777270.9570396612,528879.4115848696],["Polyglot.js",40226.94174039402,35282.119229389406,39812.98788342922,35523.487239904156],["i18next",89869.5371126247,47939.600893936215,153958.79786004967,50256.78040421447],["I18n.js",904342.9805696504,147134.24151031455,436466.4929416911,159942.10436002037],["Google Closure",2414724.8667823607,331749.4518365049,289359.19215317094,188989.91362717995],["FrenchKiss.js",29894775.18675237,11379305.696132122,14427042.205493273,10052593.336330296]]);
 
     new google.charts.Bar(document.body).draw(data, {
       chart: {
diff --git a/dist/cjs/frenchkiss.js b/dist/cjs/frenchkiss.js
index 75d3fa8..5cea089 100644
--- a/dist/cjs/frenchkiss.js
+++ b/dist/cjs/frenchkiss.js
@@ -1,6 +1,6 @@
 /**
- * @license frenchkiss 0.0.7
+ * @license frenchkiss 0.0.8
  * Copyright (c) 2018-2019 Koala Interactive, Inc.
  * License: MIT
  */
-"use strict";var t=/^\s*\w+\s*$/,r=/^\s*(\w+)\s*,\s*(select|plural)\s*,/i,n=JSON.stringify,e=function(t){return'(p["'+t+'"]||(p["'+t+'"]=="0"?0:""))'};function u(t){for(var r={},u=function t(r,u){var o=[];var f=r.length;for(var i=0;i<f;++i){var s=r[i],a=s[0],c=s[1],l="";if(0===a&&c)l=n(c);else if(1===a)l=e(c.trim());else if(2===a){for(var v=s[2],p=s[3],h=s[4],g=p.length,d=0;d<g;++d)h?"="===p[d][0][0]?l+='p["'+v+'"]=='+n(p[d][0].substr(1)):(u[v]=1,l+='m["'+v+'"]=='+n(p[d][0])):l+='p["'+v+'"]=='+n(p[d][0]),l+="?"+t(p[d][1],u)+":";l="("+l+t(c,u)+")"}l&&o.push(l)}return o.join("+")||'""'}(o(t),r),f=Object.keys(r),i=f.length,s=[],a=0;a<i;++a)s[a]=f[a]+':f(p["'+f[a]+'"])';return Function("a","f","var p=a||{}"+(i?",m=f?{"+s+"}:{}":"")+";return "+u)}function o(n){for(var e=0,u="",o=n.length,i=[],s=0;s<o;++s){var a=n[s],c=void 0;"{"===a?e++||(c=[0,u]):"}"===a&&(--e||(c=t.test(u)?[1,u]:r.test(u)?f(u):[0,u])),c?(i.push(c),u=""):u+=a}return i.push([0,u]),i}function f(t){for(var n=t.match(r),e=n[1],u="p"===n[2][0].toLowerCase(),f=o(t.replace(r,"")),i=f.length,s=[],a=[0,""],c=0;c<i-1;){var l=f[c++][1].trim(),v=o(f[c++][1]);"other"===l?a=v:s.push([l,v])}return[2,a,e,s,u]}var i={},s={},a={},c="",l="",v=function(t){return t},p=function(t,r){return i[r]||(i[r]={}),!i[r][t]&&s[r]&&"string"==typeof s[r][t]&&(i[r][t]=u(s[r][t])),i[r][t]},h={cache:i,store:s,t:function(t,r,n){var e,u=n||c;return u&&(e=p(t,u)),!e&&l&&(e=p(t,u=l)),e?e(r,a[u]):v(t)},onMissingKey:function(t){v=t},locale:function(t){return t&&(c=t),c},fallback:function(t){return t&&(l=t),l},set:function(t,r){i[t]={},s[t]=r},unset:function(t){delete i[t],delete s[t]},extend:function(t,r){s[t]||(s[t]={}),i[t]||(i[t]={});for(var n=Object.keys(r),e=n.length,u=0;u<e;++u){var o=n[u];s[t][o]=r[o],delete i[t][o]}},plural:function(t,r){a[t]=r}};module.exports=h;
+"use strict";var n=/^\s*\w+\s*$/,t=/^\s*(\w+)\s*,\s*(select|plural)\s*,/i,r=JSON.stringify,e=function(n){return'(p["'+n+'"]||(p["'+n+'"]=="0"?0:"'+n+'" in p?"":v("'+n+'",k,l)))'};function u(n){for(var t={},u=function n(t,u){var i=[];var o=t.length;for(var f=0;f<o;++f){var s=t[f],a=s[0],c=s[1],l="";if(0===a&&c)l=r(c);else if(1===a)l=e(c.trim());else if(2===a){for(var v=s[2],p=s[3],h=s[4],g=p.length,d=0;d<g;++d)h?"="===p[d][0][0]?l+='p["'+v+'"]=='+r(p[d][0].substr(1)):(u[v]=1,l+='m["'+v+'"]=='+r(p[d][0])):l+='p["'+v+'"]=='+r(p[d][0]),l+="?"+n(p[d][1],u)+":";l="("+l+n(c,u)+")"}l&&i.push(l)}return i.join("+")||'""'}(i(n),t),o=Object.keys(t),f=o.length,s=[],a=0;a<f;++a)s[a]=o[a]+':f(p["'+o[a]+'"])';return Function("a","f","k","l","v","var p=a||{}"+(f?",m=f?{"+s+"}:{}":"")+";return "+u)}function i(r){for(var e=0,u="",i=r.length,f=[],s=0;s<i;++s){var a=r[s],c=void 0;"{"===a?e++||(c=[0,u]):"}"===a&&(--e||(c=n.test(u)?[1,u]:t.test(u)?o(u):[0,u])),c?(f.push(c),u=""):u+=a}return f.push([0,u]),f}function o(n){for(var r=n.match(t),e=r[1],u="p"===r[2][0].toLowerCase(),o=i(n.replace(t,"")),f=o.length,s=[],a=[0,""],c=0;c<f-1;){var l=o[c++][1].trim(),v=i(o[c++][1]);"other"===l?a=v:u&&"="===l[0]?s.unshift([l,v]):s.push([l,v])}return[2,a,e,s,u]}var f={},s={},a={},c="",l="",v=function(n){return n},p=function(){return""},h=function(n,t){return f[t]||(f[t]={}),!f[t][n]&&s[t]&&"string"==typeof s[t][n]&&(f[t][n]=u(s[t][n])),f[t][n]},g={cache:f,store:s,t:function(n,t,r){var e,u=r||c;return u&&(e=h(n,u))?e(t,a[u],n,u,p):(u=l)&&(e=h(n,u))?e(t,a[u],n,u,p):v(n)},onMissingKey:function(n){v=n},onMissingVariable:function(n){p=n},locale:function(n){return n&&(c=n),c},fallback:function(n){return n&&(l=n),l},set:function(n,t){f[n]={},s[n]=t},unset:function(n){delete f[n],delete s[n]},extend:function(n,t){s[n]||(s[n]={}),f[n]||(f[n]={});for(var r=Object.keys(t),e=r.length,u=0;u<e;++u){var i=r[u];s[n][i]=t[i],delete f[n][i]}},plural:function(n,t){a[n]=t}};module.exports=g;
diff --git a/dist/esm/frenchkiss.js b/dist/esm/frenchkiss.js
index 7cc30b4..1a46450 100644
--- a/dist/esm/frenchkiss.js
+++ b/dist/esm/frenchkiss.js
@@ -1,6 +1,6 @@
 /**
- * @license frenchkiss 0.0.7
+ * @license frenchkiss 0.0.8
  * Copyright (c) 2018-2019 Koala Interactive, Inc.
  * License: MIT
  */
-const t=/^\s*\w+\s*$/,e=/^\s*(\w+)\s*,\s*(select|plural)\s*,/i,n=JSON.stringify,s=t=>'(p["'+t+'"]||(p["'+t+'"]=="0"?0:""))';function l(t){const e={},l=function t(e,l){const o=[];const r=e.length;for(let c=0;c<r;++c){const r=e[c],f=r[0],u=r[1];let i="";if(0===f&&u)i=n(u);else if(1===f)i=s(u.trim());else if(2===f){const e=r[2],s=r[3],o=r[4],c=s.length;for(let r=0;r<c;++r)o?"="===s[r][0][0]?i+='p["'+e+'"]=='+n(s[r][0].substr(1)):(l[e]=1,i+='m["'+e+'"]=='+n(s[r][0])):i+='p["'+e+'"]=='+n(s[r][0]),i+="?"+t(s[r][1],l)+":";i="("+i+t(u,l)+")"}i&&o.push(i)}return o.join("+")||'""'}(o(t),e),r=Object.keys(e),c=r.length,f=[];for(let t=0;t<c;++t)f[t]=r[t]+':f(p["'+r[t]+'"])';return Function("a","f","var p=a||{}"+(c?",m=f?{"+f+"}:{}":"")+";return "+l)}function o(n){let s=0,l="";const o=n.length,c=[];for(let f=0;f<o;++f){const o=n[f];let u;"{"===o?s++||(u=[0,l]):"}"===o&&(--s||(u=t.test(l)?[1,l]:e.test(l)?r(l):[0,l])),u?(c.push(u),l=""):l+=o}return c.push([0,l]),c}function r(t){const n=t.match(e),s=n[1],l="p"===n[2][0].toLowerCase(),r=o(t.replace(e,"")),c=r.length,f=[];let u=[0,""];for(let t=0;t<c-1;){let e=r[t++][1].trim();const n=o(r[t++][1]);"other"===e?u=n:f.push([e,n])}return[2,u,s,f,l]}const c={},f={};let u={},i="",p="",a=t=>t;const h=(t,e)=>(c[e]||(c[e]={}),!c[e][t]&&f[e]&&"string"==typeof f[e][t]&&(c[e][t]=l(f[e][t])),c[e][t]),g=(t,e,n)=>{let s,l=n||i;return l&&(s=h(t,l)),!s&&p&&(s=h(t,l=p)),s?s(e,u[l]):a(t)},d=t=>{a=t},m=t=>(t&&(i=t),i),y=t=>(t&&(p=t),p),b=(t,e)=>{c[t]={},f[t]=e},j=(t,e)=>{u[t]=e},k=(t,e)=>{f[t]||(f[t]={}),c[t]||(c[t]={});const n=Object.keys(e),s=n.length;for(let l=0;l<s;++l){const s=n[l];f[t][s]=e[s],delete c[t][s]}},w=t=>{delete c[t],delete f[t]};export default{cache:c,store:f,t:g,onMissingKey:d,locale:m,fallback:y,set:b,unset:w,extend:k,plural:j};export{c as cache,f as store,g as t,d as onMissingKey,m as locale,y as fallback,b as set,j as plural,k as extend,w as unset};
+const t=/^\s*\w+\s*$/,e=/^\s*(\w+)\s*,\s*(select|plural)\s*,/i,n=JSON.stringify,s=t=>'(p["'+t+'"]||(p["'+t+'"]=="0"?0:"'+t+'" in p?"":v("'+t+'",k,l)))';function l(t){const e={},l=function t(e,l){const o=[];const r=e.length;for(let c=0;c<r;++c){const r=e[c],i=r[0],f=r[1];let u="";if(0===i&&f)u=n(f);else if(1===i)u=s(f.trim());else if(2===i){const e=r[2],s=r[3],o=r[4],c=s.length;for(let r=0;r<c;++r)o?"="===s[r][0][0]?u+='p["'+e+'"]=='+n(s[r][0].substr(1)):(l[e]=1,u+='m["'+e+'"]=='+n(s[r][0])):u+='p["'+e+'"]=='+n(s[r][0]),u+="?"+t(s[r][1],l)+":";u="("+u+t(f,l)+")"}u&&o.push(u)}return o.join("+")||'""'}(o(t),e),r=Object.keys(e),c=r.length,i=[];for(let t=0;t<c;++t)i[t]=r[t]+':f(p["'+r[t]+'"])';return Function("a","f","k","l","v","var p=a||{}"+(c?",m=f?{"+i+"}:{}":"")+";return "+l)}function o(n){let s=0,l="";const o=n.length,c=[];for(let i=0;i<o;++i){const o=n[i];let f;"{"===o?s++||(f=[0,l]):"}"===o&&(--s||(f=t.test(l)?[1,l]:e.test(l)?r(l):[0,l])),f?(c.push(f),l=""):l+=o}return c.push([0,l]),c}function r(t){const n=t.match(e),s=n[1],l="p"===n[2][0].toLowerCase(),r=o(t.replace(e,"")),c=r.length,i=[];let f=[0,""];for(let t=0;t<c-1;){let e=r[t++][1].trim();const n=o(r[t++][1]);"other"===e?f=n:l&&"="===e[0]?i.unshift([e,n]):i.push([e,n])}return[2,f,s,i,l]}const c={},i={};let f={},u="",p="",a=t=>t,h=()=>"";const g=(t,e)=>(c[e]||(c[e]={}),!c[e][t]&&i[e]&&"string"==typeof i[e][t]&&(c[e][t]=l(i[e][t])),c[e][t]),b=(t,e,n)=>{let s,l=n||u;return l&&(s=g(t,l))?s(e,f[l],t,l,h):(l=p)&&(s=g(t,l))?s(e,f[l],t,l,h):a(t)},d=t=>{a=t},k=t=>{h=t},m=t=>(t&&(u=t),u),y=t=>(t&&(p=t),p),j=(t,e)=>{c[t]={},i[t]=e},v=(t,e)=>{f[t]=e},w=(t,e)=>{i[t]||(i[t]={}),c[t]||(c[t]={});const n=Object.keys(e),s=n.length;for(let l=0;l<s;++l){const s=n[l];i[t][s]=e[s],delete c[t][s]}},x=t=>{delete c[t],delete i[t]};export default{cache:c,store:i,t:b,onMissingKey:d,onMissingVariable:k,locale:m,fallback:y,set:j,unset:x,extend:w,plural:v};export{c as cache,i as store,b as t,d as onMissingKey,k as onMissingVariable,m as locale,y as fallback,j as set,v as plural,w as extend,x as unset};
diff --git a/dist/umd/frenchkiss.js b/dist/umd/frenchkiss.js
index 263e901..6f919fd 100644
--- a/dist/umd/frenchkiss.js
+++ b/dist/umd/frenchkiss.js
@@ -1,6 +1,6 @@
 /**
- * @license frenchkiss 0.0.7
+ * @license frenchkiss 0.0.8
  * Copyright (c) 2018-2019 Koala Interactive, Inc.
  * License: MIT
  */
-var e,t;e=this,t=function(){"use strict";var e=/^\s*\w+\s*$/,t=/^\s*(\w+)\s*,\s*(select|plural)\s*,/i,n=JSON.stringify,r=function(e){return'(p["'+e+'"]||(p["'+e+'"]=="0"?0:""))'};function u(e){for(var t={},u=function e(t,u){var f=[];var o=t.length;for(var i=0;i<o;++i){var s=t[i],c=s[0],a=s[1],l="";if(0===c&&a)l=n(a);else if(1===c)l=r(a.trim());else if(2===c){for(var p=s[2],v=s[3],h=s[4],d=v.length,g=0;g<d;++g)h?"="===v[g][0][0]?l+='p["'+p+'"]=='+n(v[g][0].substr(1)):(u[p]=1,l+='m["'+p+'"]=='+n(v[g][0])):l+='p["'+p+'"]=='+n(v[g][0]),l+="?"+e(v[g][1],u)+":";l="("+l+e(a,u)+")"}l&&f.push(l)}return f.join("+")||'""'}(f(e),t),o=Object.keys(t),i=o.length,s=[],c=0;c<i;++c)s[c]=o[c]+':f(p["'+o[c]+'"])';return Function("a","f","var p=a||{}"+(i?",m=f?{"+s+"}:{}":"")+";return "+u)}function f(n){for(var r=0,u="",f=n.length,i=[],s=0;s<f;++s){var c=n[s],a=void 0;"{"===c?r++||(a=[0,u]):"}"===c&&(--r||(a=e.test(u)?[1,u]:t.test(u)?o(u):[0,u])),a?(i.push(a),u=""):u+=c}return i.push([0,u]),i}function o(e){for(var n=e.match(t),r=n[1],u="p"===n[2][0].toLowerCase(),o=f(e.replace(t,"")),i=o.length,s=[],c=[0,""],a=0;a<i-1;){var l=o[a++][1].trim(),p=f(o[a++][1]);"other"===l?c=p:s.push([l,p])}return[2,c,r,s,u]}var i={},s={},c={},a="",l="",p=function(e){return e},v=function(e,t){return i[t]||(i[t]={}),!i[t][e]&&s[t]&&"string"==typeof s[t][e]&&(i[t][e]=u(s[t][e])),i[t][e]};return{cache:i,store:s,t:function(e,t,n){var r,u=n||a;return u&&(r=v(e,u)),!r&&l&&(r=v(e,u=l)),r?r(t,c[u]):p(e)},onMissingKey:function(e){p=e},locale:function(e){return e&&(a=e),a},fallback:function(e){return e&&(l=e),l},set:function(e,t){i[e]={},s[e]=t},unset:function(e){delete i[e],delete s[e]},extend:function(e,t){s[e]||(s[e]={}),i[e]||(i[e]={});for(var n=Object.keys(t),r=n.length,u=0;u<r;++u){var f=n[u];s[e][f]=t[f],delete i[e][f]}},plural:function(e,t){c[e]=t}}},"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self).frenchkiss=t();
+var n,e;n=this,e=function(){"use strict";var n=/^\s*\w+\s*$/,e=/^\s*(\w+)\s*,\s*(select|plural)\s*,/i,t=JSON.stringify,r=function(n){return'(p["'+n+'"]||(p["'+n+'"]=="0"?0:"'+n+'" in p?"":v("'+n+'",k,l)))'};function u(n){for(var e={},u=function n(e,u){var i=[];var f=e.length;for(var o=0;o<f;++o){var s=e[o],c=s[0],a=s[1],l="";if(0===c&&a)l=t(a);else if(1===c)l=r(a.trim());else if(2===c){for(var p=s[2],v=s[3],h=s[4],d=v.length,g=0;g<d;++g)h?"="===v[g][0][0]?l+='p["'+p+'"]=='+t(v[g][0].substr(1)):(u[p]=1,l+='m["'+p+'"]=='+t(v[g][0])):l+='p["'+p+'"]=='+t(v[g][0]),l+="?"+n(v[g][1],u)+":";l="("+l+n(a,u)+")"}l&&i.push(l)}return i.join("+")||'""'}(i(n),e),f=Object.keys(e),o=f.length,s=[],c=0;c<o;++c)s[c]=f[c]+':f(p["'+f[c]+'"])';return Function("a","f","k","l","v","var p=a||{}"+(o?",m=f?{"+s+"}:{}":"")+";return "+u)}function i(t){for(var r=0,u="",i=t.length,o=[],s=0;s<i;++s){var c=t[s],a=void 0;"{"===c?r++||(a=[0,u]):"}"===c&&(--r||(a=n.test(u)?[1,u]:e.test(u)?f(u):[0,u])),a?(o.push(a),u=""):u+=c}return o.push([0,u]),o}function f(n){for(var t=n.match(e),r=t[1],u="p"===t[2][0].toLowerCase(),f=i(n.replace(e,"")),o=f.length,s=[],c=[0,""],a=0;a<o-1;){var l=f[a++][1].trim(),p=i(f[a++][1]);"other"===l?c=p:u&&"="===l[0]?s.unshift([l,p]):s.push([l,p])}return[2,c,r,s,u]}var o={},s={},c={},a="",l="",p=function(n){return n},v=function(){return""},h=function(n,e){return o[e]||(o[e]={}),!o[e][n]&&s[e]&&"string"==typeof s[e][n]&&(o[e][n]=u(s[e][n])),o[e][n]};return{cache:o,store:s,t:function(n,e,t){var r,u=t||a;return u&&(r=h(n,u))?r(e,c[u],n,u,v):(u=l)&&(r=h(n,u))?r(e,c[u],n,u,v):p(n)},onMissingKey:function(n){p=n},onMissingVariable:function(n){v=n},locale:function(n){return n&&(a=n),a},fallback:function(n){return n&&(l=n),l},set:function(n,e){o[n]={},s[n]=e},unset:function(n){delete o[n],delete s[n]},extend:function(n,e){s[n]||(s[n]={}),o[n]||(o[n]={});for(var t=Object.keys(e),r=t.length,u=0;u<r;++u){var i=t[u];s[n][i]=e[i],delete o[n][i]}},plural:function(n,e){c[n]=e}}},"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(n=n||self).frenchkiss=e();
diff --git a/package.json b/package.json
index 040ae33..7a4f561 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frenchkiss",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "The blazing fast lightweight translation module for javascript",
   "author": "Vincent Thibault <vthibault.mobile@gmail.com>",
   "license": "MIT",