Simplify scheduler, allow easier config of custom scheduler