DataService improvements