Refactoring storage pool