Updated CV generation