Improve scheduler init