Issue #174 - Modify Claim Controller