Added modified WebClient