Add keypair feature