Add in some more regexes