Added new fields, updated others