Refactored Validator related classes