Added support for VPC subnets