Improve N2VC integration