Minor changes to generic DataService.