No longer depend on Vault, will add our own check in the main class