arguments to Claim
attempt to generic model
removed unused line
updated constructors