reworked diskstore