Changed to use http client factory