Changed regexes to allow a wider range of values for fields