Added additional fields, changed data count.