More config changes for scheduling