More improvements for i18n implementation