Updated regular expression