diff --git a/README.md b/README.md
index b0eb38d..5f61265 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,9 @@ $ npm install vue-fields
 ```
 
 ### CDN
-Available on [jsdelivr](https://cdn.jsdelivr.net/npm/vue-fields@1.0.7) or [unpkg](https://unpkg.com/vue-fields@1.0.7).
+Available on [jsdelivr](https://cdn.jsdelivr.net/npm/vue-fields@1.0.8) or [unpkg](https://unpkg.com/vue-fields@1.0.8).
 ```html
-<script src="https://cdn.jsdelivr.net/npm/vue-fields@1.0.7"></script>
+<script src="https://cdn.jsdelivr.net/npm/vue-fields@1.0.8"></script>
 ```
 
 ## Changelog
diff --git a/dist/vue-fields.common.js b/dist/vue-fields.common.js
index dc3fa32..c953379 100644
--- a/dist/vue-fields.common.js
+++ b/dist/vue-fields.common.js
@@ -1,5 +1,5 @@
 /*!
- * vue-fields v1.0.7
+ * vue-fields v1.0.8
  * https://github.com/pagekit/vue-fields
  * Released under the MIT License.
  */
@@ -84,7 +84,7 @@ function set(obj, key, val) {
 }
 
 var parsedFunc = {};
-var expressionRe = /((?:\d|true|false|null|undefined|(?:this\.|\$)[\S]+|\W)*)([\w][\w+.]*)?/g;
+var expressionRe = /((?:\d|true|false|null|undefined|(?:this\.|\$)[\w.]+|\W)*)([\w][\w.]*)?/g;
 var quotedStringRe = /([^"']+)((.)(?:[^\3\\]|\\.)*?\3|.)?/g;
 
 function parse(expr) {
@@ -418,7 +418,7 @@ var Plugin = {
         Vue.component('fields', Fields);
     },
 
-    version: '1.0.7'
+    version: '1.0.8'
 };
 
 if (typeof window !== 'undefined' && window.Vue) {
diff --git a/dist/vue-fields.esm.js b/dist/vue-fields.esm.js
index 83e94ae..93e0292 100644
--- a/dist/vue-fields.esm.js
+++ b/dist/vue-fields.esm.js
@@ -1,5 +1,5 @@
 /*!
- * vue-fields v1.0.7
+ * vue-fields v1.0.8
  * https://github.com/pagekit/vue-fields
  * Released under the MIT License.
  */
@@ -82,7 +82,7 @@ function set(obj, key, val) {
 }
 
 var parsedFunc = {};
-var expressionRe = /((?:\d|true|false|null|undefined|(?:this\.|\$)[\S]+|\W)*)([\w][\w+.]*)?/g;
+var expressionRe = /((?:\d|true|false|null|undefined|(?:this\.|\$)[\w.]+|\W)*)([\w][\w.]*)?/g;
 var quotedStringRe = /([^"']+)((.)(?:[^\3\\]|\\.)*?\3|.)?/g;
 
 function parse(expr) {
@@ -416,7 +416,7 @@ var Plugin = {
         Vue.component('fields', Fields);
     },
 
-    version: '1.0.7'
+    version: '1.0.8'
 };
 
 if (typeof window !== 'undefined' && window.Vue) {
diff --git a/dist/vue-fields.js b/dist/vue-fields.js
index ef8028d..d31ed85 100644
--- a/dist/vue-fields.js
+++ b/dist/vue-fields.js
@@ -1,5 +1,5 @@
 /*!
- * vue-fields v1.0.7
+ * vue-fields v1.0.8
  * https://github.com/pagekit/vue-fields
  * Released under the MIT License.
  */
@@ -88,7 +88,7 @@
     }
 
     var parsedFunc = {};
-    var expressionRe = /((?:\d|true|false|null|undefined|(?:this\.|\$)[\S]+|\W)*)([\w][\w+.]*)?/g;
+    var expressionRe = /((?:\d|true|false|null|undefined|(?:this\.|\$)[\w.]+|\W)*)([\w][\w.]*)?/g;
     var quotedStringRe = /([^"']+)((.)(?:[^\3\\]|\\.)*?\3|.)?/g;
 
     function parse(expr) {
@@ -422,7 +422,7 @@
             Vue.component('fields', Fields);
         },
 
-        version: '1.0.7'
+        version: '1.0.8'
     };
 
     if (typeof window !== 'undefined' && window.Vue) {
diff --git a/dist/vue-fields.min.js b/dist/vue-fields.min.js
index 165db66..729eb30 100644
--- a/dist/vue-fields.min.js
+++ b/dist/vue-fields.min.js
@@ -1,7 +1,7 @@
 /*!
- * vue-fields v1.0.7
+ * vue-fields v1.0.8
  * https://github.com/pagekit/vue-fields
  * Released under the MIT License.
  */
 
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.VueFields=t()}(this,function(){"use strict";var a,i={},u=Object.assign||function(n){var e=[],t=arguments.length-1;for(;0<t--;)e[t]=arguments[t+1];return e.forEach(function(t){Object.keys(t||{}).forEach(function(e){return n[e]=t[e]})}),n},o=Array.isArray;function l(e,t){void 0===t&&(t="#41B883"),"undefined"!=typeof console&&i.devtools&&console.log("%c vue-fields %c "+e+" ","color: #fff; background: #35495E; padding: 1px; border-radius: 3px 0 0 3px;","color: #fff; background: "+t+"; padding: 1px; border-radius: 0 3px 3px 0;")}function s(e,t){void 0===t&&(t="#DB6B00"),l(e,t)}function c(e){return null!==e&&"object"==typeof e}function d(e){return void 0===e}function r(e,t,n){for(var r=t.split("."),i=0;i<r.length;i++){if(d(e[r[i]]))return n;e=e[r[i]]}return e}var v={},f=/((?:\d|true|false|null|undefined|(?:this\.|\$)[\S]+|\W)*)([\w][\w+.]*)?/g,p=/([^"']+)((.)(?:[^\3\\]|\\.)*?\3|.)?/g;function t(e,t){var n,r;if("number"==typeof e.length)for(n=0;n<e.length;n++)t.call(e[n],e[n],n);else if(c(e))for(r in e)e.hasOwnProperty(r)&&t.call(e[r],e[r],r);return e}var m={inject:["Fields"],props:{field:{type:Object,required:!0},values:{type:Object,required:!0}},data:function(){return u({name:"",label:"",attrs:{},options:[],default:void 0},this.field)},computed:{value:{get:function(){return r(this.values,this.name)},set:function(e){this.$emit("change",e,this)}},attributes:{get:function(){return this.enable&&!this.Fields.evaluate(this.enable)?u({disabled:"true"},this.attrs):this.attrs}}},created:function(){d(this.value)&&!d(this.default)&&(this.value=this.default)},methods:{filterOptions:function(e){var n=this,r=[];return e?t(e,function(e,t){c(e)?r.push({label:t,options:n.filterOptions(e)}):r.push({text:t,value:e})}):s("Invalid options provided for "+this.name),r}}},h={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",t._l(t.fields,function(e){return n("div",{key:e.name},["checkbox"!=e.type?n("label",[t._v(t._s(e.label))]):t._e(),t._v(" "),n(e.component,{tag:"component",attrs:{field:e,values:t.values},on:{change:t.change}})],1)}))},staticRenderFns:[],components:{FieldText:{render:function(){var t=this,e=t.$createElement;return(t._self._c||e)("input",t._b({directives:[{name:"model",rawName:"v-model",value:t.value,expression:"value"}],attrs:{type:"text"},domProps:{value:t.value},on:{input:function(e){e.target.composing||(t.value=e.target.value)}}},"input",t.attributes,!1))},staticRenderFns:[],extends:m},FieldTextarea:{render:function(){var t=this,e=t.$createElement;return(t._self._c||e)("textarea",t._b({directives:[{name:"model",rawName:"v-model",value:t.value,expression:"value"}],domProps:{value:t.value},on:{input:function(e){e.target.composing||(t.value=e.target.value)}}},"textarea",t.attributes,!1))},staticRenderFns:[],extends:m},FieldRadio:{render:function(){var n=this,e=n.$createElement,r=n._self._c||e;return r("div",[n._l(n.filterOptions(n.options),function(t){return[r("input",n._b({directives:[{name:"model",rawName:"v-model",value:n.value,expression:"value"}],attrs:{name:n.name,type:"radio"},domProps:{value:t.value,checked:n._q(n.value,t.value)},on:{change:function(e){n.value=t.value}}},"input",n.attributes,!1)),n._v(" "),r("label",[n._v(n._s(t.text))])]})],2)},staticRenderFns:[],extends:m},FieldCheckbox:{render:function(){var a=this,e=a.$createElement;return(a._self._c||e)("input",a._b({directives:[{name:"model",rawName:"v-model",value:a.value,expression:"value"}],attrs:{type:"checkbox"},domProps:{checked:Array.isArray(a.value)?-1<a._i(a.value,null):a.value},on:{change:function(e){var t=a.value,n=e.target,r=!!n.checked;if(Array.isArray(t)){var i=a._i(t,null);n.checked?i<0&&(a.value=t.concat([null])):-1<i&&(a.value=t.slice(0,i).concat(t.slice(i+1)))}else a.value=r}}},"input",a.attributes,!1))},staticRenderFns:[],extends:m},FieldSelect:{render:function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("select",n._b({directives:[{name:"model",rawName:"v-model",value:n.value,expression:"value"}],on:{change:function(e){var t=Array.prototype.filter.call(e.target.options,function(e){return e.selected}).map(function(e){return"_value"in e?e._value:e.value});n.value=e.target.multiple?t:t[0]}}},"select",n.attributes,!1),[n._l(n.filterOptions(n.options),function(e){return[e.label?t("optgroup",{attrs:{label:e.label}},n._l(e.options,function(e){return t("option",{domProps:{value:e.value}},[n._v(n._s(e.text))])})):t("option",{domProps:{value:e.value}},[n._v(n._s(e.text))])]})],2)},staticRenderFns:[],extends:m},FieldRange:{render:function(){var t=this,e=t.$createElement;return(t._self._c||e)("input",t._b({directives:[{name:"model",rawName:"v-model",value:t.value,expression:"value"}],attrs:{type:"range"},domProps:{value:t.value},on:{__r:function(e){t.value=e.target.value}}},"input",t.attributes,!1))},staticRenderFns:[],extends:m},FieldNumber:{render:function(){var t=this,e=t.$createElement;return(t._self._c||e)("input",t._b({directives:[{name:"model",rawName:"v-model",value:t.value,expression:"value"}],attrs:{type:"number"},domProps:{value:t.value},on:{input:function(e){e.target.composing||(t.value=e.target.value)}}},"input",t.attributes,!1))},staticRenderFns:[],extends:m}},provide:function(){return{Fields:this}},props:{config:{type:[Object,Array],default:function(){}},values:{type:Object,default:function(){}},prefix:{type:String,default:"field-"}},computed:{fields:function(){return this.prepare()}},methods:{change:function(e,t){!function(e,t,n){for(var r=t.split(".");1<r.length;){var i=r.shift();c(e[i])&&!o(e[i])||a(e,i,{}),e=e[i]}a(e,r.shift(),n)}(this.values,t.name,e),d(e)||this.$emit("change",e,t)},evaluate:function(e,t){void 0===t&&(t=this.values);try{return"string"==typeof e&&(e=v[n=e]=v[n]||Function("$values","$context","with($context){return "+n.replace(p,function(e,t,n){return void 0===n&&(n=""),t.replace(f,function(e,t,n){return void 0===t&&(t=""),e?t+(n?"$get('"+n+"')":""):""})+n})+"}")),e.call(this,t,{$match:g,$get:function(e){return r(t,e)}})}catch(e){s(e)}var n;return!0},prepare:function(e,n){var r=this;void 0===e&&(e=this.config),void 0===n&&(n=this.prefix);var i=o(e),a=[];return t(e,function(e,t){(e=u({},e)).name||i||(e.name=t),e.name?(e.type||(e.type="text"),e.component||(e.component=n+e.type),e.show&&!r.evaluate(e.show)||a.push(e)):s("Field name missing "+JSON.stringify(e))}),a}}};function g(e,t,n){return e&&new RegExp(t,n).test(e)}var e={Field:m,Fields:h,install:function(e){var t,n,r;this.installed||(n=(t=e).set,r=t.config,a=n,i=r,l(this.version),e.component("field",m),e.component("fields",h))},version:"1.0.7"};return"undefined"!=typeof window&&window.Vue&&window.Vue.use(e),e});
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.VueFields=t()}(this,function(){"use strict";var a,i={},u=Object.assign||function(n){var e=[],t=arguments.length-1;for(;0<t--;)e[t]=arguments[t+1];return e.forEach(function(t){Object.keys(t||{}).forEach(function(e){return n[e]=t[e]})}),n},o=Array.isArray;function l(e,t){void 0===t&&(t="#41B883"),"undefined"!=typeof console&&i.devtools&&console.log("%c vue-fields %c "+e+" ","color: #fff; background: #35495E; padding: 1px; border-radius: 3px 0 0 3px;","color: #fff; background: "+t+"; padding: 1px; border-radius: 0 3px 3px 0;")}function s(e,t){void 0===t&&(t="#DB6B00"),l(e,t)}function c(e){return null!==e&&"object"==typeof e}function d(e){return void 0===e}function r(e,t,n){for(var r=t.split("."),i=0;i<r.length;i++){if(d(e[r[i]]))return n;e=e[r[i]]}return e}var v={},f=/((?:\d|true|false|null|undefined|(?:this\.|\$)[\w.]+|\W)*)([\w][\w.]*)?/g,p=/([^"']+)((.)(?:[^\3\\]|\\.)*?\3|.)?/g;function t(e,t){var n,r;if("number"==typeof e.length)for(n=0;n<e.length;n++)t.call(e[n],e[n],n);else if(c(e))for(r in e)e.hasOwnProperty(r)&&t.call(e[r],e[r],r);return e}var m={inject:["Fields"],props:{field:{type:Object,required:!0},values:{type:Object,required:!0}},data:function(){return u({name:"",label:"",attrs:{},options:[],default:void 0},this.field)},computed:{value:{get:function(){return r(this.values,this.name)},set:function(e){this.$emit("change",e,this)}},attributes:{get:function(){return this.enable&&!this.Fields.evaluate(this.enable)?u({disabled:"true"},this.attrs):this.attrs}}},created:function(){d(this.value)&&!d(this.default)&&(this.value=this.default)},methods:{filterOptions:function(e){var n=this,r=[];return e?t(e,function(e,t){c(e)?r.push({label:t,options:n.filterOptions(e)}):r.push({text:t,value:e})}):s("Invalid options provided for "+this.name),r}}},h={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",t._l(t.fields,function(e){return n("div",{key:e.name},["checkbox"!=e.type?n("label",[t._v(t._s(e.label))]):t._e(),t._v(" "),n(e.component,{tag:"component",attrs:{field:e,values:t.values},on:{change:t.change}})],1)}))},staticRenderFns:[],components:{FieldText:{render:function(){var t=this,e=t.$createElement;return(t._self._c||e)("input",t._b({directives:[{name:"model",rawName:"v-model",value:t.value,expression:"value"}],attrs:{type:"text"},domProps:{value:t.value},on:{input:function(e){e.target.composing||(t.value=e.target.value)}}},"input",t.attributes,!1))},staticRenderFns:[],extends:m},FieldTextarea:{render:function(){var t=this,e=t.$createElement;return(t._self._c||e)("textarea",t._b({directives:[{name:"model",rawName:"v-model",value:t.value,expression:"value"}],domProps:{value:t.value},on:{input:function(e){e.target.composing||(t.value=e.target.value)}}},"textarea",t.attributes,!1))},staticRenderFns:[],extends:m},FieldRadio:{render:function(){var n=this,e=n.$createElement,r=n._self._c||e;return r("div",[n._l(n.filterOptions(n.options),function(t){return[r("input",n._b({directives:[{name:"model",rawName:"v-model",value:n.value,expression:"value"}],attrs:{name:n.name,type:"radio"},domProps:{value:t.value,checked:n._q(n.value,t.value)},on:{change:function(e){n.value=t.value}}},"input",n.attributes,!1)),n._v(" "),r("label",[n._v(n._s(t.text))])]})],2)},staticRenderFns:[],extends:m},FieldCheckbox:{render:function(){var a=this,e=a.$createElement;return(a._self._c||e)("input",a._b({directives:[{name:"model",rawName:"v-model",value:a.value,expression:"value"}],attrs:{type:"checkbox"},domProps:{checked:Array.isArray(a.value)?-1<a._i(a.value,null):a.value},on:{change:function(e){var t=a.value,n=e.target,r=!!n.checked;if(Array.isArray(t)){var i=a._i(t,null);n.checked?i<0&&(a.value=t.concat([null])):-1<i&&(a.value=t.slice(0,i).concat(t.slice(i+1)))}else a.value=r}}},"input",a.attributes,!1))},staticRenderFns:[],extends:m},FieldSelect:{render:function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("select",n._b({directives:[{name:"model",rawName:"v-model",value:n.value,expression:"value"}],on:{change:function(e){var t=Array.prototype.filter.call(e.target.options,function(e){return e.selected}).map(function(e){return"_value"in e?e._value:e.value});n.value=e.target.multiple?t:t[0]}}},"select",n.attributes,!1),[n._l(n.filterOptions(n.options),function(e){return[e.label?t("optgroup",{attrs:{label:e.label}},n._l(e.options,function(e){return t("option",{domProps:{value:e.value}},[n._v(n._s(e.text))])})):t("option",{domProps:{value:e.value}},[n._v(n._s(e.text))])]})],2)},staticRenderFns:[],extends:m},FieldRange:{render:function(){var t=this,e=t.$createElement;return(t._self._c||e)("input",t._b({directives:[{name:"model",rawName:"v-model",value:t.value,expression:"value"}],attrs:{type:"range"},domProps:{value:t.value},on:{__r:function(e){t.value=e.target.value}}},"input",t.attributes,!1))},staticRenderFns:[],extends:m},FieldNumber:{render:function(){var t=this,e=t.$createElement;return(t._self._c||e)("input",t._b({directives:[{name:"model",rawName:"v-model",value:t.value,expression:"value"}],attrs:{type:"number"},domProps:{value:t.value},on:{input:function(e){e.target.composing||(t.value=e.target.value)}}},"input",t.attributes,!1))},staticRenderFns:[],extends:m}},provide:function(){return{Fields:this}},props:{config:{type:[Object,Array],default:function(){}},values:{type:Object,default:function(){}},prefix:{type:String,default:"field-"}},computed:{fields:function(){return this.prepare()}},methods:{change:function(e,t){!function(e,t,n){for(var r=t.split(".");1<r.length;){var i=r.shift();c(e[i])&&!o(e[i])||a(e,i,{}),e=e[i]}a(e,r.shift(),n)}(this.values,t.name,e),d(e)||this.$emit("change",e,t)},evaluate:function(e,t){void 0===t&&(t=this.values);try{return"string"==typeof e&&(e=v[n=e]=v[n]||Function("$values","$context","with($context){return "+n.replace(p,function(e,t,n){return void 0===n&&(n=""),t.replace(f,function(e,t,n){return void 0===t&&(t=""),e?t+(n?"$get('"+n+"')":""):""})+n})+"}")),e.call(this,t,{$match:g,$get:function(e){return r(t,e)}})}catch(e){s(e)}var n;return!0},prepare:function(e,n){var r=this;void 0===e&&(e=this.config),void 0===n&&(n=this.prefix);var i=o(e),a=[];return t(e,function(e,t){(e=u({},e)).name||i||(e.name=t),e.name?(e.type||(e.type="text"),e.component||(e.component=n+e.type),e.show&&!r.evaluate(e.show)||a.push(e)):s("Field name missing "+JSON.stringify(e))}),a}}};function g(e,t,n){return e&&new RegExp(t,n).test(e)}var e={Field:m,Fields:h,install:function(e){var t,n,r;this.installed||(n=(t=e).set,r=t.config,a=n,i=r,l(this.version),e.component("field",m),e.component("fields",h))},version:"1.0.8"};return"undefined"!=typeof window&&window.Vue&&window.Vue.use(e),e});
\ No newline at end of file
diff --git a/package.json b/package.json
index b2304b5..9dd167f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vue-fields",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "description": "The form fields generator for Vue.js",
     "homepage": "https://github.com/pagekit/vue-fields",
     "license": "MIT",