Updated Vault objects; Minor code refactoring