Adapt to hc2vpp refactor