Add model validations and error messages