Adjust to new cp.Snapshotable interface