Updated regexes