Refactor StorageService model