Added Stream to HttpClient and refactored