Refactored WebClient.