Add validator.demandType and validator.isOfType