Made Vault optional