CollectorController + Refactoring