Added Localization and updated keymanager