Added keygeneration option