Added some support for new AWS VPC features.