Added support for aws vpc
fixed merge