Made changes to have the client use HttpClient

#1908