Couple of tweaks to the structure so that generated text is recorded