Internal storage refactoring