Update to use snapshot