Updated data_point parsing a bit more.