Added task scheduler