Adding more validation types