DataService fixed