Snapshot refact