Added ServerProxy, fixed proxies