Improved translation handling