Keypair - added keypair module and updates