Fix problems with schedule updater and make more efficient