Replaced Generics with Factory pattern in Claim validators.