Added VPN and VPC peering support