Added support for proxy