Updating code to handle localizations