Added VPC, subnet and tenancy support.