Switch over to use Faraday