VAQUERO for CAD enrichment