Worked on the entity sub-generator