Reorganized everything. Global and local collectors are separate now.