Add HTTPClient and rename WS client