issue #22 - redesign of scheduler service