More SnapshotInfo changes
Avoid unnecessary background thread