Improve List of entities