Proxy refactoring