Data storage refactoring.