Updated generic CV