Adding Tasks support