Added HTTP client override support