Added additional components for patient management