Added auto-snapshotting