Refactor towards storage