Added group-based claim limits.