Started using Generate\Collections and Generate\Collection

And replace the arrays generated at the Generate constructor