Improved: CompanyType
Improved: PatientType