Updated mapping for savedata