Fix dataservice support, fix example app to maintain ordering