Moved Patient mapping to Assignment