Common Proxy changes