Updating the VCS code to be more flexible.