Added more advanced validations.