Add mail sending and Task ordering