HW04-05

dataStorageService usage improvement
dataStorageService improvement