Adding Arabic and Thai support