Improve WebClient