Add validations and error messages