Refactor how scheduler finds new schedules