Make mappings securer and add Gundo mapping