Proxies, refactoring, and more (2/2)