Refactored Claim class