adding proxy support