Added support for dashes within values.