Rework config, switch from force to normal scheduler