Added more options for VPC.