Updated data struct