Added i8n support for Thai and Japanese.