Entities are no longer stored in array since it was unnecesary