added proxy support