Proxy refactor