Add in better VPC handling.