Update for compatibility with vcs