Minor impro. on scheduler api