Translator refactoring
Test and bug fixes
...