Updated regular expressions