Added localization and log