Improving support for Chinese characters (utf8)