Reduce generated garbage, improve generation speed: 1x is improved from 24 seconds to 8 seconds
Add row number field to all entities