Reworking the validator class