Refactor storing storages