Yep I opened the PR too early ;) this is definitely not the final version, I just made it quick and dirty to have it working with ProxyManager