Adjust validation to allow Params to still work if validation is disabled