Improve Vault economy check