Extract class with diff logic out of Claims