minor changes, move Proxy to separate method getProxy()