Localization plugin refactored