Adapt for latest V1 types