added scheduler support