Updated DataService, beautified