Update regexes to improve grouping