Use the new snapshot collection set up