Add proper i18n support