More refactor of the storage