added validator support