Refactored l10n management