Align with latest HV-VES proto definition