VCS generalization and efficiency refactors