Replace Scheduler with SafeScheduler