add scheduler support