first refactor for adding Snapshots