Improved handling of translations