Done reworking on the list of entities