Improve support for oncvps