Change Refactor the i18n solution