Improvements to translator
Improvements to translator