Add first version of scheduler, improve DI containter, small fixes