Re-factor global iterator out of POI list