Added proxy capability
Revert "Added proxy capability"

This reverts commit 8412d151f3982281375b121c9602061ee5d4f09a.
Revert "Revert "Added proxy capability""

This reverts commit a2c3c1315d95ba523770bf6e7fcfe16a631556b0.
Added proxy