Improvements for crm_claim