Updated to reflect changes in vault.