Added HttpClientHandler and timeout to ctors