Improved translations logic