Add Diagnosis dictionaries to PG #823