Updated Validator Logic

Update the calling of the Validators logic