Added Translator + small refactoring