MixVPC refactor