Added validations for models