Fix lint stuff
Fix lint stuff
Use the base Keypair and store the key id in the extra field