Translator improvements