Changes so we don't use deprecated HttpClient