Storage refactoring.