Updated validations for models