Updated DataService, added selectset support