Improve snapshotting behavior