Updated: make Vault optional, since we can use XP fallback