Refactored DataStruct to DataStorage
Refactored DataStruct to DataStorage