adaptation of new keypair resolution and creation mechanism