Issue #174 - Add Claim Controller