Changed abstract class DataStorage to DataStorageInteface