Added additional regexs