Refactoring storable