HTTPClient needs some love