Adds support for VBV and MCSC