Added VCS factory and fixed errors