Added data for v17