Migrate to Proxy package