Add i18n support
Delete deprecated i18n support