Added missing regexes