Added generation of keywords