Reduced redundancy; added important missing fields.