Shouldn't `Validator` stay?