Added japanese support