Use HttpClient where possible