Adding ability to parameterize snapshotting