Update to use snapshot service