Updated service proxies with timeouts