Code and spec improvements to add proxy support