Refactored Claim class (in progress)