Add keypair type to save typing