Refactored validation.