Storage points refactoring