Added support for VPC links