Refactored logic to ProxyLinker