Added ids to all entities