Support reading data from the new data model

These are the changes required to return data that has been uploaded via the new data model.