Move more validations to validators.