WIP refactoring from Storage to StorageType