Update fields
Update data structure labels

as per agreement with Eric