Added basic support for proxy