Updated EF version of scheduler