Extend Vault and add key support