Improved support for Thai