Adding VPC subnet ID support