Added new regexes