Renaming Facade to Proxy to prevent confusion
Updates for proxies