Source updated so that all the Entities are kept on a list for post processing reasons. Maybe this is memory consuming and we should have it as a global option