More performance updates for lists of entities