Update for new Claim class