Update for latest regular expression handling