- Added StorageAdapter logic