improving dataService