Remaining change for VC support