Add support for proxy