MAP-964: improvements, write snapshot.