Finishing up data service API