Validator class Updated