Better handling of snapshots