Removed Vault dependency