Collector refactoring finished.