Adding support for EC2-VPC.