Added lost changes for new Claim() API method