Added more validation types