Added the generation of extra data