Added more code to Proxy