Improve scheduledJobs