1) Change AwsClient to use Provider instead of Credential directly.
2) Add vpcId to group instance properties.