Progress on data api