Changed the client to use the HttpClient