Reorg for v2 structures
Fully support v2 in proxy listener