Proxy changes

Proxy changes