Refactored patient domain model