Added support for expressions, with overridable regex