Be smarter about initializing vaults which don't need it