Removed the awful list of fields, converted it to a map