Updated to use snapshots