Refactored validators.