Performance improvements via Vault