KRACOEUS-6958: moving scheduling code