Updated for gunsmith's SchedulerProxy