Update Modules to New Scheduler