Add the possibility to have key generated by the server