Migrate to Proxy, unstable
Migrate to Proxy package