Add Vault group support.
Add Vault group support.