Make Scheduler's client more Gennerics-tolerant