Updated with new data fields.