Translations refactor