Implement Proxy package

Migrate to Proxy usage