Add validations and error msgs