Added more Vlidator Classes