Dataservice's code improvements