Storage schema refactoring