Refactored validator classes