Update index to include datapoint_id