Added support for the Chinese and Thai languages