Adding more validation