Adding proxy support