Improved names and types of fields.