Should now support vault.