Support new cnv schema