Added Japanese support