#21: CV addon