Added some more missing regexes