Scheduled jobs refactoring