Agree, the usermapping and "dummy" patient data model needs major improvement