Modification to do i18n code