Begin addition of VPC support
4 files changed