Updated the regular expressions