pure i18n compatibility + some refactoring