Added localization with Constants and Messages