Added additional regular expressions