Feature/translation changes