Changes for Chinese handling