Internationalized more code