Storage refactoring