Added support for a proxy