Refactor Storage