Move more of the retrieved info into snapshot so derived snapshots can use it directly.