Validator class added