add vouch handling