Add snapshotting, proper link