Feature/snapshots