Added colector class/scheduler in the controller