translation handling enhanced