Add valid_pubkey?