Added more validators