Added proxy suppport