Changes to the claim validation trigger