Major storage refactoring