This could be incorporated in the validator setup so we don't need a separate function.