HttpClient rework