Enhancement for Snapshot