Validator Refactoring