Added the generation in the server