Translator improvements, markers refactoring