Added new fields, changed labels