Updated save/restore checkpoint task