Make the internal store work again, and possibly almost compatible with existing vaultaire