Update with ideal i18n lib