Updated regexs to support non-ASCII types and method names