Improve VC support