Rebuilt using RTM HttpClient