Improve N2VC performance/functionality