Added VCS support