Added localization features