Added additional class types for the diagnoses.