Added working scheduler