Refactor PatientContainer