Support more flexible name/values
Use regex match instead of split on '='