Adding validator support