Added more validation checks