Refactoring towards storage implementations