Refactoring ProxyManager