Storage: Refactoring