Improvements for i18n implementation