Started adding data for v17