StorageUnit factory and old bread crumb refactorings