Refactoring
Updated Vault dependency