dataservice code updates