Improve scheduler config