That's fine. I don't expect it to be a _huge_ amount of work, but probably not a simple one-off PR. I expect it to be similar in scope and size to the proxy plugin improvements, most likely.