Update regexes to work