Add agent-proxy support