DP-334 Added proxy capability