Re: [development] Make Scheduler more generic