Started adding l10n support