Leena&Michal: Adding claimant id to claim in model