Updated models to use validators instead of validations