Added VPC support