Added Thai support