Port VAP to full ADI