[#ARCH-94 Change Patient Model]

Added missing links, Tested including unlink