Updated translation-handling