Adjusted Vault identification to match new API behaviour